Merge branch 'release/debian/3.1.0+repack-1'debian/3.1.0+repack-1

1 files changed, 4 insertions, 5 deletions

diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py
index fab54cf..218870e 100644
--- a/src/engine/SCons/TaskmasterTests.py
+++ b/src/engine/SCons/TaskmasterTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2017 The SCons Foundation
+# Copyright (c) 2001 - 2019 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 #
 from __future__ import division
 
-__revision__ = "src/engine/SCons/TaskmasterTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
+__revision__ = "src/engine/SCons/TaskmasterTests.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
 
 import SCons.compat
 
@@ -30,7 +30,6 @@ import copy
 import sys
 import unittest
 
-import TestUnit
 
 import SCons.Taskmaster
 import SCons.Errors
@@ -1086,6 +1085,7 @@ class TaskmasterTestCase(unittest.TestCase):
         exception_values = [
             "integer division or modulo",
             "integer division or modulo by zero",
+            "integer division by zero",    # PyPy2
         ]
         assert str(exc_value) in exception_values, exc_value
 
@@ -1239,8 +1239,7 @@ Taskmaster: No candidate anymore.
 
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TaskmasterTestCase, 'test_')
-    TestUnit.run(suite)
+    unittest.main()
 
 # Local Variables:
 # tab-width:4