Merge remote-tracking branch 'luckyh/fix-99-runner'

Signed-off-by: Cleber Rosa <[email protected]>
vipmike007 · Dec 14, 2022 · e0fc4a9 · e0fc4a9
2 parents 90f174e + 57fddeb
commit e0fc4a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/avocado_vt/conf.d/vt.conf b/avocado_vt/conf.d/vt.conf
@@ -1,3 +1,9 @@
+[run]
+# The avocado-vt cannot be run in parallel,
+# when this value will be >1 the vt tests won't be resolved.
+max_parallel_tasks = 1
+
+# The following section is for avocado <= 99.0
 [nrunner]
 # The avocado-vt cannot be run in parallel,
 # when this value will be >1 the vt tests won't be resolved.

diff --git a/avocado_vt/plugins/vt_resolver.py b/avocado_vt/plugins/vt_resolver.py
@@ -41,9 +41,11 @@ def _get_reference_resolution(self, reference):
         runnables = [self._parameters_to_runnable(d) for d in
                      cartesian_parser.get_dicts()]
         if runnables:
-            if self.config.get("nrunner.max_parallel_tasks", 1) != 1:
-                warnings.warn("The VT NextRunner can be run only with "
-                              "nrunner-max-parallel-tasks set to 1")
+            if self.config.get(
+                "run.max_parallel_tasks", self.config.get(
+                    "nrunner.max_parallel_tasks", 1)) != 1:
+                warnings.warn("The VT NextRunner can be run only "
+                              "with max-parallel-tasks set to 1")
             return ReferenceResolution(reference,
                                        ReferenceResolutionResult.SUCCESS,
                                        runnables)

diff --git a/avocado_vt/plugins/vt_runner.py b/avocado_vt/plugins/vt_runner.py
@@ -116,7 +116,9 @@ def run(self, runnable=None):
             self.runnable = runnable
 
         yield messages.StartedMessage.get()
-        if self.runnable.config.get("nrunner.max_parallel_tasks", 1) != 1:
+        if self.runnable.config.get(
+            "run.max_parallel_tasks", self.runnable.config.get(
+                "nrunner.max_parallel_tasks", 1)) != 1:
             yield messages.FinishedMessage.get('cancel',
                                                fail_reason="parallel run is not"
                                                " allowed for vt tests")

diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst
@@ -111,7 +111,7 @@ If there are missing requirements, please install them and re-run `vt-bootstrap`
 .. warning:: When you bootstrap avocado-vt the parallel run of avocado nrunner
              will be disabled by default, because the avocado-vt doesn't support
              parallel tests. If you run test suite without vt tests,  you can
-             enable parallel run by `nrunner.max_parallel_tasks` config variable.
+             enable parallel run by `run.max_parallel_tasks` config variable.
 
 First steps with Avocado-VT
 ===========================