Move actions done before a test run out of the constructor
The initial delay and cloning of projects were done, when a test client
object was instantiated. This didn't seem like the proper place to do it
and also led to a large constructor.
Now these steps are performed in the prerun- method, which is called before
the run()-method is called.
Change-Id: Ic6b3766f4ee12e3c0d4d4633c97fb0c7177b143c
diff --git a/container/tools/start_test.py b/container/tools/start_test.py
index 374b7dd..843cb0a 100755
--- a/container/tools/start_test.py
+++ b/container/tools/start_test.py
@@ -33,12 +33,6 @@
self.config = test_config
self.log = logging.getLogger("ActionLogger")
- if self.config["testrun"]["initialization"]["delay"]["enabled"]:
- self._wait_random_seconds(
- self.config["testrun"]["initialization"]["delay"]["min"],
- self.config["testrun"]["initialization"]["delay"]["max"],
- )
-
self.url = self.config["gerrit"]["url"]
self.user = self.config["gerrit"]["user"]
self.pwd = self.config["gerrit"]["password"]
@@ -59,6 +53,13 @@
self.cloned_projects = set()
+ def prerun(self):
+ if self.config["testrun"]["initialization"]["delay"]["enabled"]:
+ self._wait_random_seconds(
+ self.config["testrun"]["initialization"]["delay"]["min"],
+ self.config["testrun"]["initialization"]["delay"]["max"],
+ )
+
if self.config["testrun"]["initialization"]["createProjects"]["enabled"]:
self._create_initial_projects(
self.config["testrun"]["initialization"]["createProjects"]["number"]
@@ -225,4 +226,5 @@
args = parser.parse_args()
test = LoadTestInstance(config.Parser(args).parse())
+ test.prerun()
test.run()
