From 2ffbd36294fd31d2f51928c6ebb62252b1a0c39d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 20 Nov 2014 02:45:13 -0500 Subject: [PATCH] Stress tests Python scripts: fix semantics `test.py` scripts do not test anything; they are test assistants. Class and variable names should reflect that. Signed-off-by: Philippe Proulx --- tests/1.8/stress/metadata/pass/large-metadata/test.py | 8 ++++---- tests/1.8/stress/metadata/pass/long-identifier/test.py | 8 ++++---- tests/1.8/stress/metadata/pass/many-callsites/test.py | 8 ++++---- tests/1.8/stress/metadata/pass/many-stream-class/test.py | 8 ++++---- tests/1.8/stress/metadata/pass/many-typealias/test.py | 8 ++++---- tests/1.8/stress/metadata/pass/many-typedef/test.py | 8 ++++---- utils/python/ctftestsuite/stress.py | 7 ++++--- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/tests/1.8/stress/metadata/pass/large-metadata/test.py b/tests/1.8/stress/metadata/pass/large-metadata/test.py index 3e470a0..d9a876b 100755 --- a/tests/1.8/stress/metadata/pass/large-metadata/test.py +++ b/tests/1.8/stress/metadata/pass/large-metadata/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = 'large metadata with {size} extra chars' def write_metadata(self, f): @@ -25,5 +25,5 @@ class Test(MetadataTest): if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/tests/1.8/stress/metadata/pass/long-identifier/test.py b/tests/1.8/stress/metadata/pass/long-identifier/test.py index a51f663..873d044 100755 --- a/tests/1.8/stress/metadata/pass/long-identifier/test.py +++ b/tests/1.8/stress/metadata/pass/long-identifier/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = 'long identifier of {size} chars' def write_metadata(self, f): @@ -28,5 +28,5 @@ class Test(MetadataTest): if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/tests/1.8/stress/metadata/pass/many-callsites/test.py b/tests/1.8/stress/metadata/pass/many-callsites/test.py index 2f4c44e..06be00b 100755 --- a/tests/1.8/stress/metadata/pass/many-callsites/test.py +++ b/tests/1.8/stress/metadata/pass/many-callsites/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = '{size} callsites' def write_metadata(self, f): @@ -33,5 +33,5 @@ class Test(MetadataTest): if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/tests/1.8/stress/metadata/pass/many-stream-class/test.py b/tests/1.8/stress/metadata/pass/many-stream-class/test.py index ea7556f..16a3c2d 100755 --- a/tests/1.8/stress/metadata/pass/many-stream-class/test.py +++ b/tests/1.8/stress/metadata/pass/many-stream-class/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = '{size} stream classes' def write_metadata(self, f): @@ -42,5 +42,5 @@ trace { if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/tests/1.8/stress/metadata/pass/many-typealias/test.py b/tests/1.8/stress/metadata/pass/many-typealias/test.py index 66cc944..4a45ca2 100755 --- a/tests/1.8/stress/metadata/pass/many-typealias/test.py +++ b/tests/1.8/stress/metadata/pass/many-typealias/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = '{size} typealiases' def write_metadata(self, f): @@ -18,5 +18,5 @@ class Test(MetadataTest): if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/tests/1.8/stress/metadata/pass/many-typedef/test.py b/tests/1.8/stress/metadata/pass/many-typedef/test.py index 9ec068d..e5d6be0 100755 --- a/tests/1.8/stress/metadata/pass/many-typedef/test.py +++ b/tests/1.8/stress/metadata/pass/many-typedef/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from ctftestsuite.stress import MetadataTest +from ctftestsuite.stress import MetadataTestAssitant -class Test(MetadataTest): +class TestAssistant(MetadataTestAssitant): what = '{size} typedefs' def write_metadata(self, f): @@ -18,5 +18,5 @@ class Test(MetadataTest): if __name__ == '__main__': - test = Test() - test.main() + test_assistant = TestAssistant() + test_assistant.main() diff --git a/utils/python/ctftestsuite/stress.py b/utils/python/ctftestsuite/stress.py index 6f85ec5..c6c8f87 100644 --- a/utils/python/ctftestsuite/stress.py +++ b/utils/python/ctftestsuite/stress.py @@ -4,7 +4,7 @@ import sys import os -class MetadataTest: +class MetadataTestAssitant: BASIC_PROLOGUE = \ '''/* CTF 1.8 */ @@ -48,7 +48,7 @@ trace { # validate size if args.size < 1: - MetadataTest._perror('wrong size: {}'.format(args.size)) + MetadataTestAssitant._perror('wrong size: {}'.format(args.size)) return args @@ -79,7 +79,8 @@ trace { def _do_action(self): if self._action not in self._actions: - MetadataTest._perror('invalid action: "{}"'.format(self._action)) + msg = 'invalid action: "{}"'.format(self._action) + MetadataTestAssitant._perror(msg) self._actions[self._action]() -- 2.34.1