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 <eeppeliteloop@gmail.com>

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 3e470a04721e9ee6bbea1190c2a3a3db3b7540d6..d9a876bf8b71127eba1822114a932fcc660e845d 100755 (executable)
--- 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 a51f6630cee66490d3ae802da333442ae51a7c48..873d0441d2d91f35f87dc8bc87a962d8bc04ddd7 100755 (executable)
--- 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 2f4c44eefcf8741304b5de334ecda15a0b337b2e..06be00b3616ed365db5922d92e3725c733eefcc8 100755 (executable)
--- 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 ea7556f43e8c0beb942409f645265cd7495b339e..16a3c2d2535d7151260c641e8155b7de9d1cd5e3 100755 (executable)
--- 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 66cc944579510129ad2a342c08e4987881e9d691..4a45ca24189d4b420177ac2b20d5bc4131208adc 100755 (executable)
--- 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 9ec068d59380ae2127c5e7818aeb536b4d4c14a6..e5d6be0f355d10883c8c38892494d61fb9fed009 100755 (executable)
--- 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 6f85ec5dbd6bfad388fced529d821c3749a26730..c6c8f87ce91320e9b726dd09c870d1e9fe06573e 100644 (file)
--- 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]()