1 files changed, 95 insertions, 95 deletions
diff --git a/testing/framework/TestCommonTests.py b/testing/framework/TestCommonTests.py
index 6d8c27fe3..c55177188 100644
--- a/testing/framework/TestCommonTests.py
+++ b/testing/framework/TestCommonTests.py
@@ -60,15 +60,15 @@ class TestCommonTestCase(unittest.TestCase):
     """Base class for TestCommon test cases, fixture and utility methods."""
     create_run_env = True
 
-    def setUp(self):
+    def setUp(self) -> None:
         self.orig_cwd = os.getcwd()
         if self.create_run_env:
             self.run_env = TestCmd.TestCmd(workdir = '')
 
-    def tearDown(self):
+    def tearDown(self) -> None:
         os.chdir(self.orig_cwd)
 
-    def set_up_execution_scripts(self):
+    def set_up_execution_scripts(self) -> None:
         run_env = self.run_env
 
         run_env.subdir('sub dir')
@@ -118,7 +118,7 @@ class TestCommonTestCase(unittest.TestCase):
 
         run_env.write(self.stdin_script, wrapper % stdin_body)
 
-    def run_execution_test(self, script, expect_stdout, expect_stderr):
+    def run_execution_test(self, script, expect_stdout, expect_stderr) -> None:
         self.set_up_execution_scripts()
 
         run_env = self.run_env
@@ -150,7 +150,7 @@ class TestCommonTestCase(unittest.TestCase):
 
 
 class __init__TestCase(TestCommonTestCase):
-    def test___init__(self):
+    def test___init__(self) -> None:
         """Test initialization"""
         run_env = self.run_env
 
@@ -170,7 +170,7 @@ class __init__TestCase(TestCommonTestCase):
 
 class banner_TestCase(TestCommonTestCase):
     create_run_env = False
-    def test_banner(self):
+    def test_banner(self) -> None:
         """Test banner()"""
         tc = TestCommon.TestCommon(workdir='')
 
@@ -191,7 +191,7 @@ class banner_TestCase(TestCommonTestCase):
         assert b == "xyzzy ----", b
 
 class must_be_writable_TestCase(TestCommonTestCase):
-    def test_file_does_not_exists(self):
+    def test_file_does_not_exists(self) -> None:
         """Test must_be_writable():  file does not exist"""
         run_env = self.run_env
 
@@ -207,7 +207,7 @@ class must_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_writable_file_exists(self):
+    def test_writable_file_exists(self) -> None:
         """Test must_be_writable():  writable file exists"""
         run_env = self.run_env
 
@@ -229,7 +229,7 @@ class must_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_non_writable_file_exists(self):
+    def test_non_writable_file_exists(self) -> None:
         """Test must_be_writable():  non-writable file exists"""
         run_env = self.run_env
 
@@ -251,7 +251,7 @@ class must_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_file_specified_as_list(self):
+    def test_file_specified_as_list(self) -> None:
         """Test must_be_writable():  file specified as list"""
         run_env = self.run_env
 
@@ -276,7 +276,7 @@ class must_be_writable_TestCase(TestCommonTestCase):
 
 
 class must_contain_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_contain():  success"""
         run_env = self.run_env
 
@@ -293,7 +293,7 @@ class must_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_success_index_0(self):
+    def test_success_index_0(self) -> None:
         """Test must_contain():  success at index 0"""
         run_env = self.run_env
 
@@ -310,7 +310,7 @@ class must_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_missing(self):
+    def test_file_missing(self) -> None:
         """Test must_contain():  file missing"""
         run_env = self.run_env
 
@@ -326,7 +326,7 @@ class must_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("No such file or directory:") != -1, stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_contain():  failure"""
         run_env = self.run_env
 
@@ -350,7 +350,7 @@ class must_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_mode(self):
+    def test_mode(self) -> None:
         """Test must_contain():  mode"""
         run_env = self.run_env
 
@@ -372,7 +372,7 @@ class must_contain_TestCase(TestCommonTestCase):
 
 
 class must_contain_all_lines_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_contain_all_lines():  success"""
         run_env = self.run_env
 
@@ -405,7 +405,7 @@ class must_contain_all_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_contain_all_lines():  failure"""
         run_env = self.run_env
 
@@ -443,7 +443,7 @@ class must_contain_all_lines_TestCase(TestCommonTestCase):
         assert stdout == expect, assert_display(expect, stdout, stderr)
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_find(self):
+    def test_find(self) -> None:
         """Test must_contain_all_lines():  find"""
         run_env = self.run_env
 
@@ -477,7 +477,7 @@ class must_contain_all_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_title(self):
+    def test_title(self) -> None:
         """Test must_contain_all_lines():  title"""
         run_env = self.run_env
 
@@ -518,7 +518,7 @@ class must_contain_all_lines_TestCase(TestCommonTestCase):
 
 
 class must_contain_any_line_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_contain_any_line():  success"""
         run_env = self.run_env
 
@@ -551,7 +551,7 @@ class must_contain_any_line_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_contain_any_line():  failure"""
         run_env = self.run_env
 
@@ -589,7 +589,7 @@ class must_contain_any_line_TestCase(TestCommonTestCase):
         assert stdout == expect, assert_display(expect, stdout, stderr)
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_find(self):
+    def test_find(self) -> None:
         """Test must_contain_any_line():  find"""
         run_env = self.run_env
 
@@ -623,7 +623,7 @@ class must_contain_any_line_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_title(self):
+    def test_title(self) -> None:
         """Test must_contain_any_line():  title"""
         run_env = self.run_env
 
@@ -664,7 +664,7 @@ class must_contain_any_line_TestCase(TestCommonTestCase):
 
 
 class must_contain_exactly_lines_TestCase(TestCommonTestCase):
-    def test_success_list(self):
+    def test_success_list(self) -> None:
         """Test must_contain_exactly_lines():  success (input list)"""
         run_env = self.run_env
 
@@ -697,7 +697,7 @@ class must_contain_exactly_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_success_string(self):
+    def test_success_string(self) -> None:
         """Test must_contain_exactly_lines():  success (input string)"""
         run_env = self.run_env
 
@@ -730,7 +730,7 @@ class must_contain_exactly_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_contain_exactly_lines():  failure"""
         run_env = self.run_env
 
@@ -770,7 +770,7 @@ class must_contain_exactly_lines_TestCase(TestCommonTestCase):
         assert stdout == expect, assert_display(expect, stdout, stderr)
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_find(self):
+    def test_find(self) -> None:
         """Test must_contain_exactly_lines():  find"""
         run_env = self.run_env
 
@@ -812,7 +812,7 @@ class must_contain_exactly_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_title(self):
+    def test_title(self) -> None:
         """Test must_contain_exactly_lines():  title"""
         run_env = self.run_env
 
@@ -855,7 +855,7 @@ class must_contain_exactly_lines_TestCase(TestCommonTestCase):
 
 
 class must_contain_lines_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_contain_lines():  success"""
         run_env = self.run_env
 
@@ -886,7 +886,7 @@ class must_contain_lines_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_contain_lines():  failure"""
         run_env = self.run_env
 
@@ -927,7 +927,7 @@ class must_contain_lines_TestCase(TestCommonTestCase):
 
 
 class must_exist_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_exist():  success"""
         run_env = self.run_env
 
@@ -944,7 +944,7 @@ class must_exist_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_exist():  failure"""
         run_env = self.run_env
 
@@ -960,7 +960,7 @@ class must_exist_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_file_specified_as_list(self):
+    def test_file_specified_as_list(self) -> None:
         """Test must_exist():  file specified as list"""
         run_env = self.run_env
 
@@ -979,7 +979,7 @@ class must_exist_TestCase(TestCommonTestCase):
         assert stderr == "PASSED\n", stderr
 
     @unittest.skipIf(sys.platform == 'win32', "Skip symlink test on win32")
-    def test_broken_link(self) :
+    def test_broken_link(self) -> None :
         """Test must_exist():  exists but it is a broken link"""
         run_env = self.run_env
 
@@ -997,7 +997,7 @@ class must_exist_TestCase(TestCommonTestCase):
         assert stderr == "PASSED\n", stderr
 
 class must_exist_one_of_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_exist_one_of():  success"""
         run_env = self.run_env
 
@@ -1014,7 +1014,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_exist_one_of():  failure"""
         run_env = self.run_env
 
@@ -1030,7 +1030,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_files_specified_as_list(self):
+    def test_files_specified_as_list(self) -> None:
         """Test must_exist_one_of():  files specified as list"""
         run_env = self.run_env
 
@@ -1047,7 +1047,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_files_specified_with_wildcards(self):
+    def test_files_specified_with_wildcards(self) -> None:
         """Test must_exist_one_of():  files specified with wildcards"""
         run_env = self.run_env
 
@@ -1064,7 +1064,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_given_as_list(self):
+    def test_file_given_as_list(self) -> None:
         """Test must_exist_one_of():  file given as list"""
         run_env = self.run_env
 
@@ -1083,7 +1083,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_given_as_sequence(self):
+    def test_file_given_as_sequence(self) -> None:
         """Test must_exist_one_of():  file given as sequence"""
         run_env = self.run_env
 
@@ -1103,7 +1103,7 @@ class must_exist_one_of_TestCase(TestCommonTestCase):
         assert stderr == "PASSED\n", stderr
 
 class must_match_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_match():  success"""
         run_env = self.run_env
 
@@ -1120,7 +1120,7 @@ class must_match_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_does_not_exists(self):
+    def test_file_does_not_exists(self) -> None:
         """Test must_match():  file does not exist"""
         run_env = self.run_env
 
@@ -1136,7 +1136,7 @@ class must_match_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("No such file or directory:") != -1, stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_match():  failure"""
         run_env = self.run_env
 
@@ -1165,7 +1165,7 @@ class must_match_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_mode(self):
+    def test_mode(self) -> None:
         """Test must_match():  mode"""
         run_env = self.run_env
 
@@ -1187,7 +1187,7 @@ class must_match_TestCase(TestCommonTestCase):
 
 
 class must_not_be_writable_TestCase(TestCommonTestCase):
-    def test_file_does_not_exists(self):
+    def test_file_does_not_exists(self) -> None:
         """Test must_not_be_writable():  file does not exist"""
         run_env = self.run_env
 
@@ -1203,7 +1203,7 @@ class must_not_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_writable_file_exists(self):
+    def test_writable_file_exists(self) -> None:
         """Test must_not_be_writable():  writable file exists"""
         run_env = self.run_env
 
@@ -1225,7 +1225,7 @@ class must_not_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_non_writable_file_exists(self):
+    def test_non_writable_file_exists(self) -> None:
         """Test must_not_be_writable():  non-writable file exists"""
         run_env = self.run_env
 
@@ -1247,7 +1247,7 @@ class must_not_be_writable_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_specified_as_list(self):
+    def test_file_specified_as_list(self) -> None:
         """Test must_not_be_writable():  file specified as list"""
         run_env = self.run_env
 
@@ -1273,7 +1273,7 @@ class must_not_be_writable_TestCase(TestCommonTestCase):
 
 
 class must_not_contain_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_contain():  success"""
         run_env = self.run_env
 
@@ -1290,7 +1290,7 @@ class must_not_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_does_not_exist(self):
+    def test_file_does_not_exist(self) -> None:
         """Test must_not_contain():  file does not exist"""
         run_env = self.run_env
 
@@ -1306,7 +1306,7 @@ class must_not_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("No such file or directory:") != -1, stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_contain():  failure"""
         run_env = self.run_env
 
@@ -1331,7 +1331,7 @@ class must_not_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_failure_index_0(self):
+    def test_failure_index_0(self) -> None:
         """Test must_not_contain():  failure at index 0"""
         run_env = self.run_env
 
@@ -1356,7 +1356,7 @@ class must_not_contain_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_mode(self):
+    def test_mode(self) -> None:
         """Test must_not_contain():  mode"""
         run_env = self.run_env
 
@@ -1378,7 +1378,7 @@ class must_not_contain_TestCase(TestCommonTestCase):
 
 
 class must_not_contain_any_line_TestCase(TestCommonTestCase):
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_contain_any_line():  failure"""
         run_env = self.run_env
 
@@ -1422,7 +1422,7 @@ class must_not_contain_any_line_TestCase(TestCommonTestCase):
         assert stdout == expect, assert_display(expect, stdout, stderr)
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_find(self):
+    def test_find(self) -> None:
         """Test must_not_contain_any_line():  find"""
         run_env = self.run_env
 
@@ -1454,7 +1454,7 @@ class must_not_contain_any_line_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_contain_any_line():  success"""
         run_env = self.run_env
 
@@ -1483,7 +1483,7 @@ class must_not_contain_any_line_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_title(self):
+    def test_title(self) -> None:
         """Test must_not_contain_any_line():  title"""
         run_env = self.run_env
 
@@ -1528,7 +1528,7 @@ class must_not_contain_any_line_TestCase(TestCommonTestCase):
 
 
 class must_not_contain_lines_TestCase(TestCommonTestCase):
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_contain_lines():  failure"""
         run_env = self.run_env
 
@@ -1570,7 +1570,7 @@ class must_not_contain_lines_TestCase(TestCommonTestCase):
         assert stdout == expect, assert_display(expect, stdout, stderr)
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_contain_lines():  success"""
         run_env = self.run_env
 
@@ -1602,7 +1602,7 @@ class must_not_contain_lines_TestCase(TestCommonTestCase):
 
 
 class must_not_exist_TestCase(TestCommonTestCase):
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_exist():  failure"""
         run_env = self.run_env
 
@@ -1619,7 +1619,7 @@ class must_not_exist_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_exist():  success"""
         run_env = self.run_env
 
@@ -1635,7 +1635,7 @@ class must_not_exist_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_specified_as_list(self):
+    def test_file_specified_as_list(self) -> None:
         """Test must_not_exist():  file specified as list"""
         run_env = self.run_env
 
@@ -1653,7 +1653,7 @@ class must_not_exist_TestCase(TestCommonTestCase):
         assert stderr == "PASSED\n", stderr
 
     @unittest.skipIf(sys.platform == 'win32', "Skip symlink test on win32")
-    def test_existing_broken_link(self):
+    def test_existing_broken_link(self) -> None:
         """Test must_not_exist():  exists but it is a broken link"""
         run_env = self.run_env
 
@@ -1671,7 +1671,7 @@ class must_not_exist_TestCase(TestCommonTestCase):
         assert stderr.find("FAILED") != -1, stderr
 
 class must_not_exist_any_of_TestCase(TestCommonTestCase):
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_exist_any_of():  success"""
         run_env = self.run_env
 
@@ -1687,7 +1687,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_exist_any_of():  failure"""
         run_env = self.run_env
 
@@ -1704,7 +1704,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_files_specified_as_list(self):
+    def test_files_specified_as_list(self) -> None:
         """Test must_not_exist_any_of():  files specified as list"""
         run_env = self.run_env
 
@@ -1720,7 +1720,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_files_specified_with_wildcards(self):
+    def test_files_specified_with_wildcards(self) -> None:
         """Test must_not_exist_any_of():  files specified with wildcards"""
         run_env = self.run_env
 
@@ -1737,7 +1737,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_given_as_list(self):
+    def test_file_given_as_list(self) -> None:
         """Test must_not_exist_any_of():  file given as list"""
         run_env = self.run_env
 
@@ -1756,7 +1756,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_given_as_sequence(self):
+    def test_file_given_as_sequence(self) -> None:
         """Test must_not_exist_any_of():  file given as sequence"""
         run_env = self.run_env
 
@@ -1776,7 +1776,7 @@ class must_not_exist_any_of_TestCase(TestCommonTestCase):
         assert stderr == "PASSED\n", stderr
 
 class must_not_be_empty_TestCase(TestCommonTestCase):
-    def test_failure(self):
+    def test_failure(self) -> None:
         """Test must_not_be_empty():  failure"""
         run_env = self.run_env
 
@@ -1793,7 +1793,7 @@ class must_not_be_empty_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr.find("FAILED") != -1, stderr
 
-    def test_success(self):
+    def test_success(self) -> None:
         """Test must_not_be_empty():  success"""
         run_env = self.run_env
 
@@ -1810,7 +1810,7 @@ class must_not_be_empty_TestCase(TestCommonTestCase):
         stderr = run_env.stderr()
         assert stderr == "PASSED\n", stderr
 
-    def test_file_doesnt_exist(self):
+    def test_file_doesnt_exist(self) -> None:
         """Test must_not_be_empty():  failure"""
         run_env = self.run_env
 
@@ -1827,7 +1827,7 @@ class must_not_be_empty_TestCase(TestCommonTestCase):
         assert stderr.find("FAILED") != -1, stderr
 
 class run_TestCase(TestCommonTestCase):
-    def test_argument_handling(self):
+    def test_argument_handling(self) -> None:
         """Test run():  argument handling"""
 
         script = lstrip("""\
@@ -1842,7 +1842,7 @@ class run_TestCase(TestCommonTestCase):
 
         self.run_execution_test(script, "", "")
 
-    def test_default_pass(self):
+    def test_default_pass(self) -> None:
         """Test run():  default arguments, script passes"""
 
         script = lstrip("""\
@@ -1855,7 +1855,7 @@ class run_TestCase(TestCommonTestCase):
 
         self.run_execution_test(script, "", "")
 
-    def test_default_fail(self):
+    def test_default_fail(self) -> None:
         """Test run():  default arguments, script fails"""
 
         script = lstrip("""\
@@ -1885,7 +1885,7 @@ class run_TestCase(TestCommonTestCase):
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_default_stderr(self):
+    def test_default_stderr(self) -> None:
         """Test run():  default arguments, error output"""
         script = lstrip("""\
         from TestCommon import TestCommon
@@ -1914,7 +1914,7 @@ class run_TestCase(TestCommonTestCase):
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_exception_handling(self):
+    def test_exception_handling(self) -> None:
         """Test run():  exception handling"""
         script = lstrip("""\
         import TestCmd
@@ -1954,7 +1954,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_ignore_stderr(self):
+    def test_ignore_stderr(self) -> None:
         """Test run():  ignore stderr"""
 
         script = lstrip("""\
@@ -1967,7 +1967,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_match_function_stdout(self):
+    def test_match_function_stdout(self) -> None:
         """Test run():  explicit match function, stdout"""
 
         script = lstrip("""\
@@ -1984,7 +1984,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_match_function_stderr(self):
+    def test_match_function_stderr(self) -> None:
         """Test run():  explicit match function, stderr"""
 
         script = lstrip("""\
@@ -2001,7 +2001,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_matched_status_fails(self):
+    def test_matched_status_fails(self) -> None:
         """Test run():  matched status, script fails"""
 
         script = lstrip("""\
@@ -2014,7 +2014,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_matched_stdout(self):
+    def test_matched_stdout(self) -> None:
         """Test run():  matched stdout"""
 
         script = lstrip("""\
@@ -2028,7 +2028,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_matched_stderr(self):
+    def test_matched_stderr(self) -> None:
         """Test run():  matched stderr"""
 
         script = lstrip("""\
@@ -2042,7 +2042,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_mismatched_status_pass(self):
+    def test_mismatched_status_pass(self) -> None:
         """Test run():  mismatched status, script passes"""
 
         script = lstrip("""\
@@ -2072,7 +2072,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_mismatched_status_fail(self):
+    def test_mismatched_status_fail(self) -> None:
         """Test run():  mismatched status, script fails"""
 
         script = lstrip("""\
@@ -2102,7 +2102,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_mismatched_stdout(self):
+    def test_mismatched_stdout(self) -> None:
         """Test run():  mismatched stdout"""
 
         script = lstrip("""\
@@ -2134,7 +2134,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_mismatched_stderr(self):
+    def test_mismatched_stderr(self) -> None:
         """Test run():  mismatched stderr"""
 
         script = lstrip("""\
@@ -2168,7 +2168,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_option_handling(self):
+    def test_option_handling(self) -> None:
         """Test run():  option handling"""
 
         script = lstrip("""\
@@ -2183,7 +2183,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_options_plus_arguments(self):
+    def test_options_plus_arguments(self) -> None:
         """Test run():  option handling with arguments"""
 
         script = lstrip("""\
@@ -2199,7 +2199,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, "", "")
 
-    def test_signal_handling(self):
+    def test_signal_handling(self) -> None:
         """Test run():  signal handling"""
 
         try:
@@ -2237,7 +2237,7 @@ TypeError: forced TypeError
 
         self.run_execution_test(script, expect_stdout, expect_stderr)
 
-    def test_stdin(self):
+    def test_stdin(self) -> None:
         """Test run():  stdin handling"""
 
         script = lstrip("""\
@@ -2265,7 +2265,7 @@ TypeError: forced TypeError
 
 
 class start_TestCase(TestCommonTestCase):
-    def test_option_handling(self):
+    def test_option_handling(self) -> None:
         """Test start():  option handling"""
 
         script = lstrip("""\
@@ -2281,7 +2281,7 @@ class start_TestCase(TestCommonTestCase):
 
         self.run_execution_test(script, "", "")
 
-    def test_options_plus_arguments(self):
+    def test_options_plus_arguments(self) -> None:
         """Test start():  option handling with arguments"""
 
         script = lstrip("""\
@@ -2301,7 +2301,7 @@ class start_TestCase(TestCommonTestCase):
 
 
 class skip_test_TestCase(TestCommonTestCase):
-    def test_skip_test(self):
+    def test_skip_test(self) -> None:
         """Test skip_test()"""
         run_env = self.run_env
 
@@ -2356,7 +2356,7 @@ class skip_test_TestCase(TestCommonTestCase):
 
 
 class variables_TestCase(TestCommonTestCase):
-    def test_variables(self):
+    def test_variables(self) -> None:
         """Test global variables"""
         run_env = self.run_env