diff options
author | Red_M <1468433+Red-M@users.noreply.github.com> | 2023-02-14 19:15:05 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 19:15:05 +1000 |
commit | 33c6af52ac0c633f9825faca635c6ab32eb53312 (patch) | |
tree | 2b58ebc692872c7a650fa0ea3a7b81f59bc499f5 | |
parent | ab13bc5b12d513c54c64940561788fcedd18ddd2 (diff) | |
parent | 31fab7b0edbe9b3401507b5dfa4db6aaf3fabca5 (diff) | |
download | pexpect-33c6af52ac0c633f9825faca635c6ab32eb53312.tar.gz |
Merge pull request #739 from swt2c/makeSuite
Replace deprecated unittest.makeSuite
-rwxr-xr-x | tests/deprecated_test_filedescriptor.py | 2 | ||||
-rwxr-xr-x | tests/deprecated_test_run_out_of_pty.py | 2 | ||||
-rwxr-xr-x | tests/test_ansi.py | 2 | ||||
-rwxr-xr-x | tests/test_command_list_split.py | 2 | ||||
-rwxr-xr-x | tests/test_constructor.py | 2 | ||||
-rwxr-xr-x | tests/test_ctrl_chars.py | 2 | ||||
-rwxr-xr-x | tests/test_destructor.py | 2 | ||||
-rwxr-xr-x | tests/test_dotall.py | 2 | ||||
-rwxr-xr-x | tests/test_expect.py | 2 | ||||
-rwxr-xr-x | tests/test_filedescriptor.py | 2 | ||||
-rwxr-xr-x | tests/test_interact.py | 2 | ||||
-rwxr-xr-x | tests/test_isalive.py | 2 | ||||
-rwxr-xr-x | tests/test_log.py | 2 | ||||
-rwxr-xr-x | tests/test_misc.py | 2 | ||||
-rwxr-xr-x | tests/test_missing_command.py | 2 | ||||
-rwxr-xr-x | tests/test_performance.py | 2 | ||||
-rw-r--r-- | tests/test_popen_spawn.py | 2 | ||||
-rwxr-xr-x | tests/test_screen.py | 2 | ||||
-rw-r--r-- | tests/test_socket.py | 2 | ||||
-rwxr-xr-x | tests/test_timeout_pattern.py | 2 | ||||
-rw-r--r-- | tests/test_unicode.py | 2 | ||||
-rwxr-xr-x | tests/test_winsize.py | 2 |
22 files changed, 22 insertions, 22 deletions
diff --git a/tests/deprecated_test_filedescriptor.py b/tests/deprecated_test_filedescriptor.py index 6b0ef3e..cd930cf 100755 --- a/tests/deprecated_test_filedescriptor.py +++ b/tests/deprecated_test_filedescriptor.py @@ -72,7 +72,7 @@ class ExpectTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) #fout = open('delete_me_1','wb') #fout.write(the_old_way) diff --git a/tests/deprecated_test_run_out_of_pty.py b/tests/deprecated_test_run_out_of_pty.py index 3090147..b34094e 100755 --- a/tests/deprecated_test_run_out_of_pty.py +++ b/tests/deprecated_test_run_out_of_pty.py @@ -47,5 +47,5 @@ class ExpectTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) diff --git a/tests/test_ansi.py b/tests/test_ansi.py index 3d73fe8..a49c663 100755 --- a/tests/test_ansi.py +++ b/tests/test_ansi.py @@ -236,5 +236,5 @@ class ansiTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ansiTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ansiTestCase) diff --git a/tests/test_command_list_split.py b/tests/test_command_list_split.py index 370f46e..eeaf6c0 100755 --- a/tests/test_command_list_split.py +++ b/tests/test_command_list_split.py @@ -37,4 +37,4 @@ class SplitCommandLineTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(SplitCommandLineTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(SplitCommandLineTestCase) diff --git a/tests/test_constructor.py b/tests/test_constructor.py index 98c473a..1b4d717 100755 --- a/tests/test_constructor.py +++ b/tests/test_constructor.py @@ -44,5 +44,5 @@ class TestCaseConstructor(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseConstructor,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseConstructor) diff --git a/tests/test_ctrl_chars.py b/tests/test_ctrl_chars.py index 032027c..0719fc7 100755 --- a/tests/test_ctrl_chars.py +++ b/tests/test_ctrl_chars.py @@ -124,5 +124,5 @@ class TestCtrlChars(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCtrlChars,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCtrlChars) diff --git a/tests/test_destructor.py b/tests/test_destructor.py index d27b6f6..01d89a0 100755 --- a/tests/test_destructor.py +++ b/tests/test_destructor.py @@ -80,5 +80,5 @@ class TestCaseDestructor(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseDestructor,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseDestructor) diff --git a/tests/test_dotall.py b/tests/test_dotall.py index 68aef3f..44c58c5 100755 --- a/tests/test_dotall.py +++ b/tests/test_dotall.py @@ -39,5 +39,5 @@ class TestCaseDotall(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseDotall,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseDotall) diff --git a/tests/test_expect.py b/tests/test_expect.py index be6078c..c6d72da 100755 --- a/tests/test_expect.py +++ b/tests/test_expect.py @@ -714,4 +714,4 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) diff --git a/tests/test_filedescriptor.py b/tests/test_filedescriptor.py index d9164e1..3f9d954 100755 --- a/tests/test_filedescriptor.py +++ b/tests/test_filedescriptor.py @@ -69,4 +69,4 @@ class ExpectTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) diff --git a/tests/test_interact.py b/tests/test_interact.py index d18fc30..7205d80 100755 --- a/tests/test_interact.py +++ b/tests/test_interact.py @@ -97,5 +97,5 @@ class InteractTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(InteractTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(InteractTestCase) diff --git a/tests/test_isalive.py b/tests/test_isalive.py index 5e3021e..ba2b5d4 100755 --- a/tests/test_isalive.py +++ b/tests/test_isalive.py @@ -121,5 +121,5 @@ class IsAliveTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(IsAliveTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(IsAliveTestCase) diff --git a/tests/test_log.py b/tests/test_log.py index 4ad2256..e2defff 100755 --- a/tests/test_log.py +++ b/tests/test_log.py @@ -104,5 +104,5 @@ class TestCaseLog(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseLog,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseLog) diff --git a/tests/test_misc.py b/tests/test_misc.py index 3dc2b6e..5c81f92 100755 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -370,4 +370,4 @@ class TestCaseMisc(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseMisc,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseMisc) diff --git a/tests/test_missing_command.py b/tests/test_missing_command.py index 92e4733..3775632 100755 --- a/tests/test_missing_command.py +++ b/tests/test_missing_command.py @@ -34,5 +34,5 @@ class MissingCommandTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(MissingCommandTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(MissingCommandTestCase) diff --git a/tests/test_performance.py b/tests/test_performance.py index d7e2cd6..05027a0 100755 --- a/tests/test_performance.py +++ b/tests/test_performance.py @@ -110,4 +110,4 @@ class PerformanceTestCase (PexpectTestCase.PexpectTestCase): if __name__ == "__main__": unittest.main() -suite = unittest.makeSuite(PerformanceTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(PerformanceTestCase) diff --git a/tests/test_popen_spawn.py b/tests/test_popen_spawn.py index 10d7032..6168148 100644 --- a/tests/test_popen_spawn.py +++ b/tests/test_popen_spawn.py @@ -136,4 +136,4 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) diff --git a/tests/test_screen.py b/tests/test_screen.py index 2429e57..9e275bc 100755 --- a/tests/test_screen.py +++ b/tests/test_screen.py @@ -282,6 +282,6 @@ class screenTestCase (PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(screenTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(screenTestCase) diff --git a/tests/test_socket.py b/tests/test_socket.py index a8c8595..548d90a 100644 --- a/tests/test_socket.py +++ b/tests/test_socket.py @@ -277,4 +277,4 @@ class ExpectTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(ExpectTestCase, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(ExpectTestCase) diff --git a/tests/test_timeout_pattern.py b/tests/test_timeout_pattern.py index 5f610ef..35d4816 100755 --- a/tests/test_timeout_pattern.py +++ b/tests/test_timeout_pattern.py @@ -89,4 +89,4 @@ class Exp_TimeoutTestCase(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(Exp_TimeoutTestCase,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(Exp_TimeoutTestCase) diff --git a/tests/test_unicode.py b/tests/test_unicode.py index 9b5b988..6103167 100644 --- a/tests/test_unicode.py +++ b/tests/test_unicode.py @@ -184,4 +184,4 @@ class UnicodeTests(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(UnicodeTests, 'test') +suite = unittest.TestLoader().loadTestsFromTestCase(UnicodeTests) diff --git a/tests/test_winsize.py b/tests/test_winsize.py index be16773..6fc78ce 100755 --- a/tests/test_winsize.py +++ b/tests/test_winsize.py @@ -55,6 +55,6 @@ class TestCaseWinsize(PexpectTestCase.PexpectTestCase): if __name__ == '__main__': unittest.main() -suite = unittest.makeSuite(TestCaseWinsize,'test') +suite = unittest.TestLoader().loadTestsFromTestCase(TestCaseWinsize) |