]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
suite.run: extract write_result() out of prepare_and_schedule()
authorKefu Chai <kchai@redhat.com>
Fri, 24 Aug 2018 11:40:14 +0000 (19:40 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 31 Aug 2018 03:18:28 +0000 (11:18 +0800)
so it's more modular.

Signed-off-by: Kefu Chai <kchai@redhat.com>
teuthology/suite/run.py

index 8abca0fc6bc90a3f6a83267ca1f3b7fa1665fc9d..8de984bdba3709aab7c6ab6b91277ba9dd529dab 100644 (file)
@@ -291,6 +291,26 @@ class Run(object):
             base_args.extend(['--owner', self.args.owner])
         return base_args
 
+    def write_result(self):
+        arg = copy.deepcopy(self.base_args)
+        arg.append('--last-in-suite')
+        if self.base_config.email:
+            arg.extend(['--email', self.base_config.email])
+        if self.args.subset:
+            subset = '/'.join(str(i) for i in self.args.subset)
+            arg.extend(['--subset', subset])
+        arg.extend(['--seed', str(self.args.seed)])
+        if self.args.timeout:
+            arg.extend(['--timeout', self.args.timeout])
+        util.teuthology_schedule(
+            args=arg,
+            dry_run=self.args.dry_run,
+            verbose=self.args.verbose,
+            log_prefix="Results: ")
+        results_url = get_results_url(self.base_config.name)
+        if results_url:
+            log.info("Test results viewable at %s", results_url)
+
     def prepare_and_schedule(self):
         """
         Puts together some "base arguments" with which to execute
@@ -309,25 +329,7 @@ class Run(object):
         num_jobs = self.schedule_suite()
 
         if num_jobs:
-            arg = copy.deepcopy(self.base_args)
-            arg.append('--last-in-suite')
-            if self.base_config.email:
-                arg.extend(['--email', self.base_config.email])
-            if self.args.subset:
-                subset = '/'.join(str(i) for i in self.args.subset)
-                arg.extend(['--subset', subset])
-            arg.extend(['--seed', str(self.args.seed)])
-            if self.args.timeout:
-                arg.extend(['--timeout', self.args.timeout])
-            util.teuthology_schedule(
-                args=arg,
-                dry_run=self.args.dry_run,
-                verbose=self.args.verbose,
-                log_prefix="Results: ",
-            )
-            results_url = get_results_url(self.base_config.name)
-            if results_url:
-                log.info("Test results viewable at %s", results_url)
+            self.write_result()
 
     def collect_jobs(self, arch, configs, newest=False):
         jobs_to_schedule = []