Merge pull request #36809 from porglezomp-misc/test-more-thorough

[build-script] Fix tests that assertRaises incorrectly

Author: porglezomp

utils/build_swift/tests/build_swift/argparse/test_types.py

@@ -138,7 +138,9 @@ def test_raises_argument_error(self):
 
         with self.assertRaises(ArgumentTypeError):
             regex_type('')
+        with self.assertRaises(ArgumentTypeError):
             regex_type('b')
+        with self.assertRaises(ArgumentTypeError):
             regex_type('baaaa')
 
 
@@ -165,9 +167,12 @@ def test_invalid_clang_version(self):
 
         with self.assertRaises(ArgumentTypeError):
             clang_version_type('2')
+        with self.assertRaises(ArgumentTypeError):
             clang_version_type('3.0')
-            clang_version_type('1.8.0.2')
-            clang_version_type('100.0.56.1')
+        with self.assertRaises(ArgumentTypeError):
+            clang_version_type('1.8.0.2.1')
+        with self.assertRaises(ArgumentTypeError):
+            clang_version_type('100.0.56.1.1')
 
 
 class TestSwiftVersionType(unittest.TestCase):
@@ -201,7 +206,9 @@ def test_invalid_swift_version(self):
 
         with self.assertRaises(ArgumentTypeError):
             swift_version_type('2')
+        with self.assertRaises(ArgumentTypeError):
             swift_version_type('1.8.0.2.3.1')
+        with self.assertRaises(ArgumentTypeError):
             swift_version_type('100.0.56.1.85.1')
 
 

utils/build_swift/tests/build_swift/test_driver_arguments.py

@@ -107,7 +107,7 @@ def test(self):
             with utils.redirect_stdout() as output:
                 with self.assertRaises(ParserError):
                     self.parse_args([option.option_string])
-                    self.assertNotEmpty(output)
+                self.assertTrue(output)
 
         return test
 
@@ -454,7 +454,9 @@ def test_option_clang_compiler_version(self):
 
         with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1.2'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '0.0.0.0.1'])
 
     def test_option_clang_user_visible_version(self):
@@ -466,7 +468,9 @@ def test_option_clang_user_visible_version(self):
 
         with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1.2'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '0.0.0.0.1'])
 
     def test_option_swift_compiler_version(self):
@@ -478,6 +482,7 @@ def test_option_swift_compiler_version(self):
 
         with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '0.0.0.1'])
 
     def test_option_swift_user_visible_version(self):
@@ -489,6 +494,7 @@ def test_option_swift_user_visible_version(self):
 
         with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '1'])
+        with self.assertRaises(ParserError):
             self.parse_default_args([option_string, '0.0.0.1'])
 
     def test_option_I(self):