From 2a437232459b74023ffe8d36ed04f75c8bd618dd Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Fri, 30 Jan 2015 13:29:42 +0000 Subject: [PATCH] Bug 1127523 - Allow functional tests to be run against any loop-server. r=dmose NPOTB DONTBUILD --- .../loop/test/functional/serversetup.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/browser/components/loop/test/functional/serversetup.py b/browser/components/loop/test/functional/serversetup.py index 61695d2a214e..22cc82114747 100644 --- a/browser/components/loop/test/functional/serversetup.py +++ b/browser/components/loop/test/functional/serversetup.py @@ -38,12 +38,16 @@ LOOP_SERVER_ENV.update({"NODE_ENV": "dev", class LoopTestServers: def __init__(self): - self.loop_server = self.start_loop_server() + loop_server_location = os.environ.get('LOOP_SERVER') + if loop_server_location.startswith("http"): + FIREFOX_PREFERENCES["loop.server"] = loop_server_location + return + + self.loop_server = self.start_loop_server(loop_server_location) self.content_server = self.start_content_server() @staticmethod - def start_loop_server(): - loop_server_location = os.environ.get('LOOP_SERVER') + def start_loop_server(loop_server_location): if loop_server_location is None: raise Exception('LOOP_SERVER variable not set') @@ -68,6 +72,8 @@ class LoopTestServers: return p def shutdown(self): - self.content_server.kill() - self.loop_server.kill() + if hasattr(self, "content_server"): + self.content_server.kill() + if hasattr(self, "loop_server"): + self.loop_server.kill()