1 files changed, 17 insertions, 16 deletions

diff --git a/catapult/devil/devil/utils/parallelizer_test.py b/catapult/devil/devil/utils/parallelizer_test.py
index 7c86148c..2d8f72aa 100644
--- a/catapult/devil/devil/utils/parallelizer_test.py
+++ b/catapult/devil/devil/utils/parallelizer_test.py
@@ -19,6 +19,7 @@ if __name__ == '__main__':
       os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
 from devil.utils import parallelizer
+from devil.base_error import BaseError
 
 
 class ParallelizerTestObject(object):
@@ -58,7 +59,7 @@ class ParallelizerTestObject(object):
   def _write_completion_file(self):
     if self._completion_file_name and len(self._completion_file_name):
       with open(self._completion_file_name, 'w+b') as completion_file:
-        completion_file.write('complete')
+        completion_file.write(b'complete')
 
   def __getitem__(self, index):
     return self._thing[index]
@@ -87,13 +88,13 @@ class ParallelizerTest(unittest.TestCase):
     self.assertEquals(expected, r)
 
   def testMutate(self):
-    devices = [ParallelizerTestObject(True) for _ in xrange(0, 10)]
+    devices = [ParallelizerTestObject(True) for _ in range(0, 10)]
     self.assertTrue(all(d.doReturnTheThing() for d in devices))
     ParallelizerTestObject.parallel(devices).doSetTheThing(False).pFinish(1)
     self.assertTrue(not any(d.doReturnTheThing() for d in devices))
 
   def testAllReturn(self):
-    devices = [ParallelizerTestObject(True) for _ in xrange(0, 10)]
+    devices = [ParallelizerTestObject(True) for _ in range(0, 10)]
     results = ParallelizerTestObject.parallel(devices).doReturnTheThing().pGet(
         1)
     self.assertTrue(isinstance(results, list))
@@ -103,7 +104,7 @@ class ParallelizerTest(unittest.TestCase):
   def testAllRaise(self):
     devices = [
         ParallelizerTestObject(Exception('thing %d' % i))
-        for i in xrange(0, 10)
+        for i in range(0, 10)
     ]
     p = ParallelizerTestObject.parallel(devices).doRaiseTheThing()
     with self.assertRaises(Exception):
@@ -117,21 +118,21 @@ class ParallelizerTest(unittest.TestCase):
     try:
       completion_files = [
           tempfile.NamedTemporaryFile(delete=False)
-          for _ in xrange(0, parallel_device_count)
+          for _ in range(0, parallel_device_count)
       ]
       devices = [
           ParallelizerTestObject(
-              i if i != exception_index else Exception(exception_msg),
+              i if i != exception_index else BaseError(exception_msg),
               completion_files[i].name)
-          for i in xrange(0, parallel_device_count)
+          for i in range(0, parallel_device_count)
       ]
       for f in completion_files:
         f.close()
       p = ParallelizerTestObject.parallel(devices)
-      with self.assertRaises(Exception) as e:
+      with self.assertRaises(BaseError) as e:
         p.doRaiseIfExceptionElseSleepFor(2).pGet(3)
       self.assertTrue(exception_msg in str(e.exception))
-      for i in xrange(0, parallel_device_count):
+      for i in range(0, parallel_device_count):
         with open(completion_files[i].name) as f:
           if i == exception_index:
             self.assertEquals('', f.read())
@@ -142,7 +143,7 @@ class ParallelizerTest(unittest.TestCase):
         os.remove(f.name)
 
   def testReusable(self):
-    devices = [ParallelizerTestObject(True) for _ in xrange(0, 10)]
+    devices = [ParallelizerTestObject(True) for _ in range(0, 10)]
     p = ParallelizerTestObject.parallel(devices)
     results = p.doReturn(True).pGet(1)
     self.assertTrue(all(results))
@@ -152,23 +153,23 @@ class ParallelizerTest(unittest.TestCase):
       results = p.doRaise(Exception('reusableTest')).pGet(1)
 
   def testContained(self):
-    devices = [ParallelizerTestObject(i) for i in xrange(0, 10)]
+    devices = [ParallelizerTestObject(i) for i in range(0, 10)]
     results = (ParallelizerTestObject.parallel(devices).helper.
                doReturnStringThing().pGet(1))
     self.assertTrue(isinstance(results, list))
     self.assertEquals(10, len(results))
-    for i in xrange(0, 10):
+    for i in range(0, 10):
       self.assertEquals(str(i), results[i])
 
   def testGetItem(self):
-    devices = [ParallelizerTestObject(range(i, i + 10)) for i in xrange(0, 10)]
+    devices = [ParallelizerTestObject(range(i, i + 10)) for i in range(0, 10)]
     results = ParallelizerTestObject.parallel(devices)[9].pGet(1)
-    self.assertEquals(range(9, 19), results)
+    self.assertEquals(list(range(9, 19)), results)
 
 
 class SyncParallelizerTest(unittest.TestCase):
   def testContextManager(self):
-    in_context = [False for i in xrange(10)]
+    in_context = [False for i in range(10)]
 
     @contextlib.contextmanager
     def enter_into_context(i):
@@ -179,7 +180,7 @@ class SyncParallelizerTest(unittest.TestCase):
         in_context[i] = False
 
     parallelized_context = parallelizer.SyncParallelizer(
-        [enter_into_context(i) for i in xrange(10)])
+        [enter_into_context(i) for i in range(10)])
 
     with parallelized_context:
       self.assertTrue(all(in_context))