Issue #29371: merge with 3.5

1 files changed, 24 insertions, 3 deletions

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 5e0f990e40..e83a4d6426 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -241,9 +241,8 @@ class TestSupport(unittest.TestCase):
 
     def test_check_syntax_error(self):
         support.check_syntax_error(self, "def class", lineno=1, offset=9)
-        self.assertRaises(AssertionError, support.check_syntax_error, self, "1")
-        #with self.assertRaises(AssertionError):
-            #support.check_syntax_error(self, "x=1")
+        with self.assertRaises(AssertionError):
+            support.check_syntax_error(self, "x=1")
 
     def test_CleanImport(self):
         import importlib
@@ -327,6 +326,28 @@ class TestSupport(unittest.TestCase):
                 self.OtherClass, self.RefClass, ignore=ignore)
         self.assertEqual(set(), missing_items)
 
+    def test_check__all__(self):
+        extra = {'tempdir'}
+        blacklist = {'template'}
+        support.check__all__(self,
+                             tempfile,
+                             extra=extra,
+                             blacklist=blacklist)
+
+        extra = {'TextTestResult', 'installHandler'}
+        blacklist = {'load_tests', "TestProgram", "BaseTestSuite"}
+
+        support.check__all__(self,
+                             unittest,
+                             ("unittest.result", "unittest.case",
+                              "unittest.suite", "unittest.loader",
+                              "unittest.main", "unittest.runner",
+                              "unittest.signals"),
+                             extra=extra,
+                             blacklist=blacklist)
+
+        self.assertRaises(AssertionError, support.check__all__, self, unittest)
+
     # XXX -follows a list of untested API
     # make_legacy_pyc
     # is_resource_enabled