Bug 1559975 - convert testing/mochitest to python3 r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D37096

--HG--
extra : moz-landing-system : lando

testing/mochitest/bisection.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import math
 import mozinfo
 
@@ -275,6 +277,6 @@ class Bisect(object):
 
     def print_summary(self):
         "This method is used to print the recorded summary."
-        print "Bisection summary:"
+        print("Bisection summary:")
         for line in self.summary:
-            print line
+            print(line)

testing/mochitest/runjunit.py

@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
+
 import argparse
 import os
 import posixpath
@@ -306,8 +308,8 @@ class JUnitTestRunner(MochitestDesktop):
                 # minidumps directory is automatically created when the app
                 # (first) starts, so its lack of presence is a hint that
                 # something went wrong.
-                print "Automation Error: No crash directory (%s) found on remote device" % \
-                    remote_dir
+                print("Automation Error: " +
+                      "No crash directory ({}) found on remote device".format(remote_dir))
                 return True
             self.device.pull(remote_dir, dump_dir)
             crashed = mozcrash.log_crashes(self.log, dump_dir, symbols_path,

testing/mochitest/runrobocop.py

@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
+
 import json
 import os
 import posixpath
@@ -554,9 +556,9 @@ class RobocopTestRunner(MochitestDesktop):
                 "No tests run. Did you pass an invalid TEST_PATH?")
             worstTestResult = 1
         else:
-            print "INFO | runtests.py | Test summary: start."
+            print("INFO | runtests.py | Test summary: start.")
             logResult = self.logTestSummary()
-            print "INFO | runtests.py | Test summary: end."
+            print("INFO | runtests.py | Test summary: end.")
             if worstTestResult == 0:
                 worstTestResult = logResult
         return worstTestResult

testing/mochitest/runtests.py

@@ -2368,7 +2368,7 @@ toolbar#nav-bar {
 
         if marionette_exception is not None:
             exc, value, tb = marionette_exception
-            raise exc, value, tb
+            raise exc(value).with_traceback(tb)
 
         return status, self.lastTestSeen
 

tools/lint/py3.yml

@@ -16,7 +16,6 @@ py3:
         - testing/awsy
         - testing/firefox-ui/harness/firefox_ui_harness/runners/update.py
         - testing/gtest
-        - testing/mochitest
         - testing/mozharness
         - testing/tps
         - testing/web-platform

tools/rewriting/ThirdPartyPaths.txt

@@ -115,6 +115,7 @@ security/sandbox/chromium/
 security/sandbox/chromium-shim/
 testing/gtest/gmock/
 testing/gtest/gtest/
+testing/mochitest/pywebsocket
 testing/talos/talos/tests/dromaeo/
 testing/talos/talos/tests/kraken/
 testing/talos/talos/tests/v8_7/