Backed out changeset 5a0d061f7548 (bug 1231981)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 25 Apr 2016 16:28:50 +0200
changeset 319255 966b2dc8d9e3ef17913561d1d3ef465950db1fe7
parent 319254 17a5796a6140e2e96ee3e723b23ac5725075ae48
child 319256 c8652ef9f94bef3ca849501ac4447b6973332d0a
push id9671
push userraliiev@mozilla.com
push dateMon, 06 Jun 2016 20:27:52 +0000
treeherdermozilla-aurora@cea65ca3d0bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1231981
milestone48.0a1
backs out5a0d061f75488cd6a44e59d9858742ae61b48f04
Backed out changeset 5a0d061f7548 (bug 1231981)
python/mozbuild/mozbuild/virtualenv.py
testing/mochitest/mach_commands.py
testing/mochitest/runtests.py
--- a/python/mozbuild/mozbuild/virtualenv.py
+++ b/python/mozbuild/mozbuild/virtualenv.py
@@ -457,27 +457,16 @@ class VirtualenvManager(object):
         virtualenv, you can simply instantiate an instance of this class
         and call .ensure() and .activate() to make the virtualenv active.
         """
 
         execfile(self.activate_path, dict(__file__=self.activate_path))
         if isinstance(os.environ['PATH'], unicode):
             os.environ['PATH'] = os.environ['PATH'].encode('utf-8')
 
-    def install_pip_requirements_file(self, requirements_filename):
-        """Installs packages in |requirements_filename| via pip."""
-
-        args = [
-            'install',
-            '-r',
-            requirements_filename
-        ]
-
-        return self._run_pip(args)
-
     def install_pip_package(self, package):
         """Install a package via pip.
 
         The supplied package is specified using a pip requirement specifier.
         e.g. 'foo' or 'foo==1.0'.
 
         If the package is already installed, this is a no-op.
         """
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -150,22 +150,16 @@ class MochitestRunner(MozbuildObject):
 
         self.tests_dir = os.path.join(self.topobjdir, '_tests')
         self.mochitest_dir = os.path.join(
             self.tests_dir,
             'testing',
             'mochitest')
         self.bin_dir = os.path.join(self.topobjdir, 'dist', 'bin')
 
-        self._activate_virtualenv()
-        self.virtualenv_manager.install_pip_requirements_file(
-                os.path.join(self.mochitest_dir,
-                             'websocketprocessbridge',
-                             'websocketprocessbridge_requirements.txt'))
-
     def resolve_tests(self, test_paths, test_objects=None, cwd=None):
         if test_objects:
             return test_objects
 
         from mozbuild.testing import TestResolver
         resolver = self._spawn(TestResolver)
         tests = list(resolver.resolve_tests(paths=test_paths, cwd=cwd))
         return tests
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -809,17 +809,16 @@ class MochitestBase(object):
     def startWebsocketProcessBridge(self, options):
         """Create a websocket server that can launch various processes that
         JS needs (eg; ICE server for webrtc testing)
         """
 
         command = [sys.executable,
                    os.path.join("websocketprocessbridge",
                                 "websocketprocessbridge.py")]
-        os.environ['PYTHONPATH'] = os.pathsep.join(p for p in sys.path)
         self.websocketprocessbridge = mozprocess.ProcessHandler(command,
                                                                 cwd=SCRIPT_DIR)
         self.websocketprocessbridge.run()
         self.log.info("runtests.py | websocket/process bridge pid: %d"
                       % self.websocketprocessbridge.pid)
 
         # ensure the server is up, wait for at most ten seconds
         for i in range(1,100):