Backed out changeset ec61b7a902c2 (bug 1397855) for XPCshell bustage, at least on Android. r=backout on a CLOSED TREE

testing/xpcshell/mach_test_package_commands.py

@@ -2,7 +2,7 @@
 # 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 absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import os
 import sys

testing/xpcshell/remotexpcshelltests.py

@@ -4,8 +4,6 @@
 # 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 absolute_import, print_function
-
 import logging
 import posixpath
 import sys, os
@@ -170,7 +168,7 @@ class RemoteXPCShellTestThread(xpcshell.XPCShellTestThread):
             # The minidumps directory is automatically created when Fennec
             # (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" % self.remoteMinidumpDir)
+            print "Automation Error: No crash directory (%s) found on remote device" % self.remoteMinidumpDir
             # Whilst no crash was found, the run should still display as a failure
             return True
         with mozfile.TemporaryDirectory() as dumpDir:
@@ -377,7 +375,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
                 if packageName:
                     self.appRoot = self.device.getAppRoot(packageName.strip())
             except Exception as detail:
-                print("unable to determine app root: " + str(detail))
+                print "unable to determine app root: " + str(detail)
                 pass
         return None
 
@@ -496,7 +494,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
 
     def setupTestDir(self):
-        print('pushing %s' % self.xpcDir)
+        print 'pushing %s' % self.xpcDir
         try:
             # The tests directory can be quite large: 5000 files and growing!
             # Sometimes - like on a low-end aws instance running an emulator - the push

testing/xpcshell/runxpcshelltests.py

@@ -4,8 +4,6 @@
 # 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 absolute_import, print_function
-
 import copy
 import importlib
 import json
@@ -1070,7 +1068,7 @@ class XPCShellTests(object):
                     searchObj = re.search( r'HTTP2 server listening on port (.*)', msg, 0)
                     if searchObj:
                       self.env["MOZHTTP2_PORT"] = searchObj.group(1)
-            except OSError as e:
+            except OSError, e:
                 # This occurs if the subprocess couldn't be started
                 self.log.error('Could not run %s server: %s' % (name, str(e)))
                 raise

testing/xpcshell/selftest.py

@@ -4,8 +4,6 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 #
 
-from __future__ import absolute_import
-
 import mozinfo
 import mozunit
 import os
@@ -1086,7 +1084,7 @@ add_test({
         try:
             # The actual return value is never checked because we raise.
             self.assertTestResult(True)
-        except Exception as ex:
+        except Exception, ex:
             raised = True
             self.assertEquals(ex.message[0:9], "head file")
 

testing/xpcshell/xpcshellcommandline.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import argparse
 
 from mozlog import commandline

tools/lint/py2.yml

@@ -51,6 +51,7 @@ py2:
         - testing/tools
         - testing/tps
         - testing/web-platform
+        - testing/xpcshell
         - third_party
         - toolkit
         - tools/docs