Bug 1126699 - Functional tests incorrectly need the local servers running on a user's computer. r=NiKo NPOTB DONTBUILD
authorMark Banner <standard8@mozilla.com>
Wed, 28 Jan 2015 08:46:44 +0000
changeset 239604 9352849eaade01855be64c384a2e091ee69d4e6f
parent 239603 30f5081b32007f243e2483db4e11cfcaaad4b939
child 239605 d8260c1a0689da5f4f3252bf41063e8a03c8fbbc
child 239711 cd65efe1b24c87630f726c308d0d1b59b9c1cfc8
push id500
push userjoshua.m.grant@gmail.com
push dateThu, 29 Jan 2015 01:48:36 +0000
reviewersNiKo
bugs1126699
milestone38.0a1
Bug 1126699 - Functional tests incorrectly need the local servers running on a user's computer. r=NiKo NPOTB DONTBUILD
browser/components/loop/test/functional/serversetup.py
--- a/browser/components/loop/test/functional/serversetup.py
+++ b/browser/components/loop/test/functional/serversetup.py
@@ -18,27 +18,27 @@ from config import *
 
 CONTENT_SERVER_COMMAND = ["make", "runserver"]
 CONTENT_SERVER_ENV = os.environ.copy()
 # Set PORT so that it does not interfere with any other
 # development server that might be running
 CONTENT_SERVER_ENV.update({"PORT": str(CONTENT_SERVER_PORT),
                            "LOOP_SERVER_PORT": str(LOOP_SERVER_PORT)})
 
-WEB_APP_URL = "http://localhost:" + str(CONTENT_SERVER_PORT) + \
-              "/content/#call/{token}"
+ROOMS_WEB_APP_URL = "http://localhost:" + str(CONTENT_SERVER_PORT) + \
+  "/content/{token}"
 
 LOOP_SERVER_COMMAND = ["make", "runserver"]
 LOOP_SERVER_ENV = os.environ.copy()
 # Set PORT so that it does not interfere with any other
 # development server that might be running
 LOOP_SERVER_ENV.update({"NODE_ENV": "dev",
                         "PORT": str(LOOP_SERVER_PORT),
                         "SERVER_ADDRESS": "localhost:" + str(LOOP_SERVER_PORT),
-                        "WEB_APP_URL": WEB_APP_URL})
+                        "ROOMS_WEB_APP_URL": ROOMS_WEB_APP_URL})
 
 
 class LoopTestServers:
     def __init__(self):
         self.loop_server = self.start_loop_server()
         self.content_server = self.start_content_server()
 
     @staticmethod