We want to use avocado for tests, but we don't like its default jUnit style
of test presentation. So, we plan to use some custom plugins to make
test writing more approachable. Start with the implementation of the
"runner" plugin. We also add some supporting pieces: an interim trivial
resolver plugin and setup.py so we can actually do some stuff with that
runner.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/.gitignore | 1 +
test/Makefile | 6 +-
test/avocado_classless/.gitignore | 1 +
.../avocado_classless/__init__.py | 11 +
.../avocado_classless/plugin.py | 216 ++++++++++++++++++
test/avocado_classless/examples.py | 16 ++
test/avocado_classless/setup.py | 32 +++
7 files changed, 282 insertions(+), 1 deletion(-)
create mode 100644 test/avocado_classless/.gitignore
create mode 100644 test/avocado_classless/avocado_classless/__init__.py
create mode 100644 test/avocado_classless/avocado_classless/plugin.py
create mode 100644 test/avocado_classless/examples.py
create mode 100644 test/avocado_classless/setup.py
diff --git a/test/.gitignore b/test/.gitignore
index bf84c336..d376dac3 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -10,3 +10,4 @@ nstool
guest-key
guest-key.pub
/venv/
+__pycache__/
diff --git a/test/Makefile b/test/Makefile
index d4d0c1a3..9b3af410 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -208,8 +208,10 @@ jammy-server-cloudimg-s390x.img:
PYTHON = python3
VENV = venv
+PLUGIN = avocado_classless
-AVOCADO := $(shell which avocado)
+# Put this back if/when the plugin becomes available in upstream/system avocado
+#AVOCADO := $(shell which avocado)
ifeq ($(AVOCADO),)
AVOCADO := $(VENV)/bin/avocado
endif
@@ -217,6 +219,7 @@ endif
$(VENV):
$(PYTHON) -m venv $(VENV)
$(VENV)/bin/pip install avocado-framework
+ $(VENV)/bin/pip install -e ./$(PLUGIN)
.PHONY: avocado-assets
avocado-assets:
@@ -231,3 +234,4 @@ check: avocado check-legacy
clean: clean-legacy
$(RM) -r $(VENV)
find -name *~ | xargs $(RM)
+ find -name __pycache__ -or -name '*.egg-info' | xargs $(RM) -r
diff --git a/test/avocado_classless/.gitignore b/test/avocado_classless/.gitignore
new file mode 100644
index 00000000..865e3c86
--- /dev/null
+++ b/test/avocado_classless/.gitignore
@@ -0,0 +1 @@
+avocado_classless.egg-info/
diff --git a/test/avocado_classless/avocado_classless/__init__.py
b/test/avocado_classless/avocado_classless/__init__.py
new file mode 100644
index 00000000..738185c1
--- /dev/null
+++ b/test/avocado_classless/avocado_classless/__init__.py
@@ -0,0 +1,11 @@
+#! /usr/bin/python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david(a)gibson.dropbear.id.au>
+
+"""
+Avocado plugin to allow tests as plain Python functions, no
+confusing classes or other jUnit-derived needless OO stuff.
+"""
diff --git a/test/avocado_classless/avocado_classless/plugin.py
b/test/avocado_classless/avocado_classless/plugin.py
new file mode 100644
index 00000000..48b89ce9
--- /dev/null
+++ b/test/avocado_classless/avocado_classless/plugin.py
@@ -0,0 +1,216 @@
+#! /usr/bin/python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david(a)gibson.dropbear.id.au>
+
+"""
+Implementation of the Avocado resolver and runner for classless tests.
+"""
+
+import importlib
+import multiprocessing
+import os.path
+import sys
+import time
+import traceback
+
+from avocado.core.extension_manager import PluginPriority
+from avocado.core.test import Test, TestID
+from avocado.core.nrunner.app import BaseRunnerApp
+from avocado.core.nrunner.runnable import Runnable
+from avocado.core.nrunner.runner import (
+ RUNNER_RUN_CHECK_INTERVAL,
+ RUNNER_RUN_STATUS_INTERVAL,
+ BaseRunner,
+)
+from avocado.core.plugin_interfaces import Resolver
+from avocado.core.resolver import (
+ ReferenceResolution,
+ ReferenceResolutionResult,
+ check_file
+)
+from avocado.core.utils import messages
+
+
+SHBANG = b'#! /usr/bin/env avocado-runner-avocado-classless'
+DEFAULT_TIMEOUT = 5.0
+
+
+def load_mod(path):
+ """Load a module containing classless tests"""
+ modname = os.path.basename(path)[:-3]
+ moddir = os.path.abspath(os.path.dirname(path))
+
+ try:
+ sys.path.insert(0, moddir)
+ return importlib.import_module(modname)
+ finally:
+ if moddir in sys.path:
+ sys.path.remove(moddir)
+
+
+class ClasslessResolver(Resolver):
+ """Resolver plugin for classless tests"""
+ # pylint: disable=R0903
+
+ name = "avocado-classless"
+ description = "Resolver for classless tests (not jUnit style)"
+ priority = PluginPriority.HIGH
+
+ def resolve(self, reference):
+ path, _ = reference.rsplit(':', 1)
+
+ # First check it looks like a Python file
+ filecheck = check_file(path, reference)
+ if filecheck is not True:
+ return filecheck
+
+ # Then check it looks like an avocado-classless file
+ with open(path, 'rb') as testfile:
+ shbang = testfile.readline()
+ if shbang.strip() != SHBANG:
+ return ReferenceResolution(
+ reference,
+ ReferenceResolutionResult.NOTFOUND,
+ info=f'{path} does not have first line "{SHBANG}"
line',
+ )
+
+ return ReferenceResolution(
+ reference,
+ ReferenceResolutionResult.SUCCESS,
+ [Runnable("avocado-classless", reference)]
+ )
+
+
+def run_classless(runnable, queue):
+ """Invoked within isolating process, run classless
tests"""
+ try:
+ path, testname = runnable.uri.rsplit(':', 1)
+ mod = load_mod(path)
+ test = getattr(mod, testname)
+
+ class ClasslessTest(Test):
+ """Shim class for classless tests"""
+ def test(self):
+ """Execute classless test"""
+ test()
+
+ result_dir = runnable.output_dir
+ instance = ClasslessTest(
+ name=TestID(0, runnable.uri),
+ config=runnable.config,
+ base_logdir=result_dir,
+ )
+
+ messages.start_logging(runnable.config, queue)
+
+ instance.run_avocado()
+
+ state = instance.get_state()
+ fail_reason = state.get("fail_reason")
+ queue.put(
+ messages.FinishedMessage.get(
+ state["status"].lower(),
+ fail_reason=fail_reason,
+ fail_class=state.get("fail_class"),
+ traceback=state.get("traceback"),
+ )
+ )
+ except Exception as exc: # pylint: disable=W0718
+ queue.put(messages.StderrMessage.get(traceback.format_exc()))
+ queue.put(
+ messages.FinishedMessage.get(
+ "error",
+ fail_reason=str(exc),
+ fail_class=exc.__class__.__name__,
+ traceback=traceback.format_exc(),
+ )
+ )
+
+
+class ClasslessRunner(BaseRunner):
+ """Runner for classless tests
+
+ When creating the Runnable, use the following attributes:
+
+ * kind: should be 'avocado-classless';
+
+ * uri: path to a test file, then ':' then a function name within that
file
+
+ * args: not used;
+
+ * kwargs: not used;
+
+ Example:
+
+ runnable = Runnable(kind='avocado-classless',
+ uri='example.py:test_example')
+ """
+
+ name = "avocado-classless"
+ description = "Runner for classless tests (not jUnit style)"
+
+ CONFIGURATION_USED = [
+ "core.show",
+ "job.run.store_logging_stream",
+ ]
+
+ def run(self, runnable):
+ yield messages.StartedMessage.get()
+ try:
+ queue = multiprocessing.SimpleQueue()
+ process = multiprocessing.Process(
+ target=run_classless, args=(runnable, queue)
+ )
+ process.start()
+
+ time_started = time.monotonic()
+ timeout = DEFAULT_TIMEOUT
+ next_status_time = None
+ while True:
+ time.sleep(RUNNER_RUN_CHECK_INTERVAL)
+ now = time.monotonic()
+ if queue.empty():
+ if (
+ next_status_time is None
+ or now > next_status_time
+ ):
+ next_status_time = now + RUNNER_RUN_STATUS_INTERVAL
+ yield messages.RunningMessage.get()
+ if (now - time_started) > timeout:
+ process.terminate()
+ yield messages.FinishedMessage.get("interrupted",
+ "timeout")
+ break
+ else:
+ message = queue.get()
+ yield message
+ if message.get("status") == "finished":
+ break
+ except Exception as exc: # pylint: disable=W0718
+ yield messages.StderrMessage.get(traceback.format_exc())
+ yield messages.FinishedMessage.get(
+ "error",
+ fail_reason=str(exc),
+ fail_class=exc.__class__.__name__,
+ traceback=traceback.format_exc(),
+ )
+
+
+class RunnerApp(BaseRunnerApp):
+ """Runner app for classless tests"""
+ PROG_NAME = "avocado-runner-avocado-classless"
+ PROG_DESCRIPTION = "nrunner application for classless tests"
+ RUNNABLE_KINDS_CAPABLE = ["avocado-classless"]
+
+
+def main():
+ """Run some avocado-classless tests"""
+ app = RunnerApp(print)
+ app.run()
+
+
+if __name__ == "__main__":
+ main()
diff --git a/test/avocado_classless/examples.py b/test/avocado_classless/examples.py
new file mode 100644
index 00000000..3895ee81
--- /dev/null
+++ b/test/avocado_classless/examples.py
@@ -0,0 +1,16 @@
+#! /usr/bin/env avocado-runner-avocado-classless
+
+"""
+Example avocado-classless style tests
+"""
+
+import sys
+
+
+def trivial_pass():
+ print("Passes, trivially")
+
+
+def trivial_fail():
+ print("Fails, trivially", file=sys.stderr)
+ assert False
diff --git a/test/avocado_classless/setup.py b/test/avocado_classless/setup.py
new file mode 100644
index 00000000..94fcc127
--- /dev/null
+++ b/test/avocado_classless/setup.py
@@ -0,0 +1,32 @@
+#! /usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david(a)gibson.dropbear.id.au>
+
+"""
+Setup script for avocado-classless plugin
+"""
+
+from setuptools import setup, find_packages
+
+NAME = "avocado-classless"
+PKGNAME = "avocado_classless"
+
+resolver = f"{PKGNAME}.plugin:ClasslessResolver"
+runner = f"{PKGNAME}.plugin:ClasslessRunner"
+runscript = f"{PKGNAME}.plugin:main"
+
+if __name__ == "__main__":
+ setup(
+ name="avocado-classless",
+ version="0.1",
+ description="Avocado Classless Test Type",
+ packages=find_packages(),
+ entry_points={
+ "avocado.plugins.resolver": [f"{NAME} = {resolver}"],
+ "avocado.plugins.runnable.runner": [f"{NAME} =
{runner}"],
+ "console_scripts": [f"avocado-runner-{NAME} =
{runscript}"],
+ },
+ )
--
2.41.0