Backed out 2 changesets (bug 1714688) for causing Bug 1717578. CLOSED TREE

Backed out changeset 997f00815e6b (bug 1714688)
Backed out changeset 941f6c6c51e3 (bug 1714688)

testing/mochitest/mach_commands.py

@@ -421,7 +421,7 @@ class MachCommands(MachCommandBase):
                 "testing",
                 "tools",
                 "websocketprocessbridge",
-                "websocketprocessbridge_requirements.txt",
+                "websocketprocessbridge_requirements_3.txt",
             )
             self.virtualenv_manager.activate()
             self.virtualenv_manager.install_pip_requirements(req, require_hashes=False)

testing/mochitest/moz.build

@@ -201,6 +201,7 @@ TEST_HARNESS_FILES.testing.mochitest.iceserver += [
 TEST_HARNESS_FILES.testing.mochitest.websocketprocessbridge += [
     "/testing/tools/websocketprocessbridge/websocketprocessbridge.py",
     "/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt",
+    "/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt",
 ]
 
 with Files("**"):

testing/mozharness/scripts/android_emulator_unittest.py

@@ -28,6 +28,7 @@ from mozharness.mozilla.testing.codecoverage import (
     code_coverage_config_options,
 )
 
+PY2 = sys.version_info.major == 2
 SUITE_DEFAULT_E10S = ["geckoview-junit", "mochitest", "reftest"]
 SUITE_NO_E10S = ["cppunittest", "geckoview-junit", "xpcshell"]
 SUITE_REPEATABLE = ["mochitest", "reftest"]
@@ -404,12 +405,16 @@ class AndroidEmulatorTest(
         dirs = self.query_abs_dirs()
         requirements = None
         suites = self._query_suites()
+        if PY2:
+            wspb_requirements = "websocketprocessbridge_requirements.txt"
+        else:
+            wspb_requirements = "websocketprocessbridge_requirements_3.txt"
         if ("mochitest-media", "mochitest-media") in suites:
             # mochitest-media is the only thing that needs this
             requirements = os.path.join(
                 dirs["abs_mochitest_dir"],
                 "websocketprocessbridge",
-                "websocketprocessbridge_requirements.txt",
+                wspb_requirements,
             )
         if requirements:
             self.register_virtualenv_module(requirements=[requirements], two_pass=True)

testing/mozharness/scripts/android_hardware_unittest.py

@@ -24,6 +24,7 @@ from mozharness.mozilla.testing.android import AndroidMixin
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 from mozharness.mozilla.testing.codecoverage import CodeCoverageMixin
 
+PY2 = sys.version_info.major == 2
 SUITE_DEFAULT_E10S = ["geckoview-junit", "mochitest", "reftest"]
 SUITE_NO_E10S = ["cppunittest", "xpcshell"]
 SUITE_REPEATABLE = ["mochitest", "reftest"]
@@ -357,12 +358,16 @@ class AndroidHardwareTest(
         requirements = None
         suites = self._query_suites()
         # mochitest is the only thing that needs this
+        if PY2:
+            wspb_requirements = "websocketprocessbridge_requirements.txt"
+        else:
+            wspb_requirements = "websocketprocessbridge_requirements_3.txt"
         if ("mochitest-media", "mochitest-media") in suites:
             # mochitest-media is the only thing that needs this
             requirements = os.path.join(
                 dirs["abs_mochitest_dir"],
                 "websocketprocessbridge",
-                "websocketprocessbridge_requirements.txt",
+                wspb_requirements,
             )
         if requirements:
             self.register_virtualenv_module(requirements=[requirements], two_pass=True)

testing/mozharness/scripts/awsy_script.py

@@ -33,6 +33,7 @@ from mozharness.mozilla.testing.codecoverage import (
     code_coverage_config_options,
 )
 
+PY2 = sys.version_info.major == 2
 scripts_path = os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__)))
 external_tools_path = os.path.join(scripts_path, "external_tools")
 
@@ -242,7 +243,7 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
             env["EXTERNALTOOLSPATH"] = external_tools_path
 
         runtime_testvars_path = os.path.join(self.awsy_path, "runtime-testvars.json")
-        runtime_testvars_file = open(runtime_testvars_path, "w")
+        runtime_testvars_file = open(runtime_testvars_path, "wb" if PY2 else "w")
         runtime_testvars_file.write(json.dumps(runtime_testvars, indent=2))
         runtime_testvars_file.close()
 

testing/mozharness/scripts/desktop_unittest.py

@@ -41,6 +41,7 @@ from mozharness.mozilla.testing.codecoverage import (
 )
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 
+PY2 = sys.version_info.major == 2
 SUITE_CATEGORIES = [
     "gtest",
     "cppunittest",
@@ -474,11 +475,15 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
 
         if self._query_specified_suites("mochitest") is not None:
             # mochitest is the only thing that needs this
+            if PY2:
+                wspb_requirements = "websocketprocessbridge_requirements.txt"
+            else:
+                wspb_requirements = "websocketprocessbridge_requirements_3.txt"
             requirements_files.append(
                 os.path.join(
                     dirs["abs_mochitest_dir"],
                     "websocketprocessbridge",
-                    "websocketprocessbridge_requirements.txt",
+                    wspb_requirements,
                 )
             )
 

testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt

@@ -1,15 +1,13 @@
-# This file is the websocketprocess requirements.txt used with python 3.
-
 # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
 six
 vcversioner==2.16.0.0
-twisted>=18.7.0
+twisted==10.2.0
 
 # websocket adapter for twisted, might be built into twisted someday
-txws-upgrade==0.10.0
+txws==0.9.1
 
 psutil>=5.6.3
 
 # Needed by iceserver
-ipaddr>=2.2.0
+ipaddr==2.1.11
 passlib==1.6.5

testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt

@@ -0,0 +1,15 @@
+# This file is the websocketprocess requirements.txt used with python 3.
+
+# needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
+six
+vcversioner==2.16.0.0
+twisted>=18.7.0
+
+# websocket adapter for twisted, might be built into twisted someday
+txws-upgrade==0.10.0
+
+psutil>=5.6.3
+
+# Needed by iceserver
+ipaddr>=2.2.0
+passlib==1.6.5