Add ability to run tests in parallel [PULP-753]

Author: gerrod3

.github/workflows/test.yml

@@ -115,5 +115,5 @@ jobs:
           PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}"
           OAS_VERSION: "${{ matrix.oas_version }}"
         run: |
-          .ci/run_container.sh make livetest
+          .ci/run_container.sh make paralleltest
 ...

Makefile

@@ -42,6 +42,10 @@ test: | tests/cli.toml
 livetest: | tests/cli.toml
 	python3 -m pytest -v tests pulp-glue/tests -m live
 
+.PHONY: paralleltest
+paralleltest: | tests/cli.toml
+	python3 -m pytest -v tests pulp-glue/tests -m live -n 8
+
 .PHONY: unittest
 unittest:
 	python3 -m pytest -v tests pulp-glue/tests cookiecutter/pulp_filter_extension.py -m "not live"

cookiecutter/ci/cookiecutter.json

@@ -8,6 +8,7 @@
   "current_version": "0.0.1.dev",
   "test_matrix": null,
   "unittests": false,
+  "paralleltests": false,
   "__app_label_suffix": "{{ cookiecutter.app_label and '-' + cookiecutter.app_label }}",
   "__project_name": "pulp-cli{{ cookiecutter.__app_label_suffix }}",
   "repository": "https://github.com/pulp/{{ cookiecutter.__project_name }}",

cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml

@@ -87,5 +87,5 @@ jobs:
           OAS_VERSION: "${{ matrix.oas_version }}"
           {%- endraw %}
         run: |
-          .ci/run_container.sh make {% if cookiecutter.unittests %}live{% endif %}test
+          .ci/run_container.sh make {% if cookiecutter.paralleltests %}parallel{% elif cookiecutter.unittests %}live{% endif %}test
 ...

cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile

@@ -57,6 +57,10 @@ test: | tests/cli.toml
 livetest: | tests/cli.toml
 	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live
 
+.PHONY: paralleltest
+paralleltest: | tests/cli.toml
+	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live -n 8
+
 .PHONY: unittest
 unittest:
 	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %}

cookiecutter/ci/{{ cookiecutter.__project_name }}/pyproject.toml.update

@@ -23,6 +23,7 @@ translations = {{ cookiecutter.translations | toml_value }}
 main_package = {{ cookiecutter.main_package | toml_value }}
 binary_dependencies = {{ cookiecutter.binary_dependencies | toml_value }}
 unittests = {{ cookiecutter.unittests | toml_value }}
+paralleltests = {{ cookiecutter.paralleltests | toml_value }}
 
 [tool.bumpversion]
 # This section is managed by the cookiecutter templates.

pulpcore/cli/container/distribution.py

@@ -5,6 +5,7 @@
 from pulp_glue.common.context import (
     EntityDefinition,
     EntityFieldDefinition,
+    PluginRequirement,
     PulpEntityContext,
     PulpRepositoryContext,
 )
@@ -115,6 +116,9 @@ def update(
 
     distribution: EntityDefinition = distribution_ctx.entity
     body: EntityDefinition = {}
+    non_blocking = base_path is None and distribution_ctx.pulp_ctx.has_plugin(
+        PluginRequirement("core", specifier=">=3.24.0")
+    )
 
     if private is not None:
         body["private"] = private
@@ -135,16 +139,18 @@ def update(
             repository = t.cast(PulpEntityContext, repository)
             if version is not None:
                 if distribution["repository"]:
-                    distribution_ctx.update(body={"repository": ""}, non_blocking=True)
+                    distribution_ctx.update(body={"repository": ""}, non_blocking=non_blocking)
                 body["repository_version"] = f"{repository.pulp_href}versions/{version}/"
             else:
                 if distribution["repository_version"]:
-                    distribution_ctx.update(body={"repository_version": ""}, non_blocking=True)
+                    distribution_ctx.update(
+                        body={"repository_version": ""}, non_blocking=non_blocking
+                    )
                 body["repository"] = repository.pulp_href
     elif version is not None:
         # keep current repository, change version
         if distribution["repository"]:
-            distribution_ctx.update(body={"repository": ""}, non_blocking=True)
+            distribution_ctx.update(body={"repository": ""}, non_blocking=non_blocking)
             body["repository_version"] = f"{distribution['repository']}versions/{version}/"
         elif distribution["repository_version"]:
             # 'dummy' vars are to get us around a mypy/1.2 complaint about '_'

pulpcore/cli/core/task.py

@@ -151,6 +151,10 @@ def cancel(
         states.append("running")
     if states:
         tasks = task_ctx.list(limit=1 << 64, offset=0, parameters={"state__in": states})
+        if pulp_ctx.api._dry_run:
+            raise click.ClickException(
+                _("Trying to cancel {} tasks in safe-mode, aborting").format(len(tasks))
+            )
         for task in tasks:
             task_ctx.cancel(task["pulp_href"], background=True)
         for task in tasks:

pyproject.toml

@@ -75,6 +75,7 @@ translations = true
 main_package = "common"
 binary_dependencies = ""
 unittests = true
+paralleltests = true
 
 [tool.bumpversion]
 # This section is managed by the cookiecutter templates.

test_requirements.txt

@@ -1,5 +1,6 @@
 # Test requirements
 pytest>=7.0.0,<9.1
+pytest-xdist
 pytest-subtests>=0.12.0,<0.16
 python-gnupg>=0.5.0,<0.6
 trustme>=1.1.0,<1.3