From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: crosa@redhat.com, jarichte@redhat.com,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 08/27] tasst, avocado: Introduce library of common test helpers
Date: Tue, 27 Jun 2023 12:54:09 +1000 [thread overview]
Message-ID: <20230627025429.2209702-9-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230627025429.2209702-1-david@gibson.dropbear.id.au>
Create a Python package "tasst" with common helper code for use in passt
and pasta. Initially it just has some trivial typechecking helpers.
Extend the avocado-meta tests to include selftests within the tasst
library. This lets us test the functionality of the library itself without
involving actual passt or pasta.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
test/Makefile | 8 ++++---
test/tasst/__init__.py | 11 ++++++++++
test/tasst/typecheck.py | 47 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 3 deletions(-)
create mode 100644 test/tasst/__init__.py
create mode 100644 test/tasst/typecheck.py
diff --git a/test/Makefile b/test/Makefile
index fc8d3a6f..c06d63b6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -209,7 +209,8 @@ jammy-server-cloudimg-s390x.img:
PYTHON = python3
VENV = venv
PLUGIN = avocado_classless
-PYPKGS = $(PLUGIN)/$(PLUGIN) $(wildcard $(PLUGIN)/*.py)
+PYPKGS = $(PLUGIN)/$(PLUGIN) $(wildcard $(PLUGIN)/*.py) \
+ tasst
# Put this back if/when the plugin becomes available in upstream/system avocado
#AVOCADO := $(shell which avocado)
@@ -229,11 +230,11 @@ avocado-assets:
.PHONY: avocado
avocado: avocado-assets $(VENV)
- $(AVOCADO) run avocado
+ PYTHONPATH=. $(AVOCADO) run avocado
.PHONY: avocado-meta
avocado-meta: avocado-assets $(VENV)
- $(AVOCADO) run $(PLUGIN)/selftests.py
+ PYTHONPATH=. $(AVOCADO) run $(PLUGIN)/selftests.py tasst
flake8: $(VENV)
$(VENV)/bin/flake8 $(PYPKGS)
@@ -251,6 +252,7 @@ pylint: $(VENV)
.PHONY: check
check: avocado check-legacy
+.PHONY: clean
clean: clean-legacy
$(RM) -r $(VENV)
find -name *~ | xargs $(RM)
diff --git a/test/tasst/__init__.py b/test/tasst/__init__.py
new file mode 100644
index 00000000..c1d5d9dd
--- /dev/null
+++ b/test/tasst/__init__.py
@@ -0,0 +1,11 @@
+#! /usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""
+Test A Simple Socket Transport
+library of test helpers for passt & pasta
+"""
diff --git a/test/tasst/typecheck.py b/test/tasst/typecheck.py
new file mode 100644
index 00000000..f97fc401
--- /dev/null
+++ b/test/tasst/typecheck.py
@@ -0,0 +1,47 @@
+#! /usr/bin/env avocado-runner-avocado-classless
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""
+Test A Simple Socket Transport
+
+Type checking and related helpers
+"""
+
+from avocado_classless.test import test, assert_eq, assert_raises
+
+
+def typecheck(val, ty_):
+ """typecheck(val, ty_)
+
+ Return val, raising TypeError if it does not have type ty_.
+ """
+ if not isinstance(val, ty_):
+ raise TypeError(f'Expected {ty_} instead of {type(val)}')
+ return val
+
+
+@test
+def test_typecheck():
+ assert_eq(typecheck(17, int), 17)
+ assert_eq(typecheck("hello", str), "hello")
+ assert_raises(TypeError, typecheck, 17, str)
+
+
+def typecheck_default(val, ty_, default):
+ """typecheck_default(val, ty_, default)
+
+ If val is None, return default. Otherwise return typecheck(val, ty_).
+ """
+ if val is None:
+ return default
+ return typecheck(val, ty_)
+
+
+@test
+def test_typecheck_default():
+ assert_eq(typecheck_default(17, int, None), 17)
+ assert_eq(typecheck_default(None, int, 17), 17)
--
@@ -0,0 +1,47 @@
+#! /usr/bin/env avocado-runner-avocado-classless
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""
+Test A Simple Socket Transport
+
+Type checking and related helpers
+"""
+
+from avocado_classless.test import test, assert_eq, assert_raises
+
+
+def typecheck(val, ty_):
+ """typecheck(val, ty_)
+
+ Return val, raising TypeError if it does not have type ty_.
+ """
+ if not isinstance(val, ty_):
+ raise TypeError(f'Expected {ty_} instead of {type(val)}')
+ return val
+
+
+@test
+def test_typecheck():
+ assert_eq(typecheck(17, int), 17)
+ assert_eq(typecheck("hello", str), "hello")
+ assert_raises(TypeError, typecheck, 17, str)
+
+
+def typecheck_default(val, ty_, default):
+ """typecheck_default(val, ty_, default)
+
+ If val is None, return default. Otherwise return typecheck(val, ty_).
+ """
+ if val is None:
+ return default
+ return typecheck(val, ty_)
+
+
+@test
+def test_typecheck_default():
+ assert_eq(typecheck_default(17, int, None), 17)
+ assert_eq(typecheck_default(None, int, 17), 17)
--
2.41.0
next prev parent reply other threads:[~2023-06-27 2:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 2:54 [PATCH 00/27] RFC: Start converting passt & pasta tests to Avocado using special plugin David Gibson
2023-06-27 2:54 ` [PATCH 01/27] avocado: Make a duplicate copy of testsuite for comparison purposes David Gibson
2023-06-27 2:54 ` [PATCH 02/27] avocado: Don't double download assets for test/ and oldtest/ David Gibson
2023-06-27 2:54 ` [PATCH 03/27] avocado: Move static checkers to avocado David Gibson
2023-06-27 2:54 ` [PATCH 04/27] avocado: Introduce "avocado-classless" plugin, runner and outline David Gibson
2023-06-27 2:54 ` [PATCH 05/27] avocado, test: Add static checkers for Python code David Gibson
2023-06-27 2:54 ` [PATCH 06/27] avocado: Resolver implementation for avocado-classless plugin David Gibson
2023-06-27 2:54 ` [PATCH 07/27] avocado: Add basic assertion helpers to " David Gibson
2023-06-27 2:54 ` David Gibson [this message]
2023-06-27 2:54 ` [PATCH 09/27] avocado-classless: Test matrices by composition David Gibson
2023-06-27 2:54 ` [PATCH 10/27] tasst: Helper functions for executing commands in different places David Gibson
2023-06-27 2:54 ` [PATCH 11/27] avocado-classless: Allow overriding default timeout David Gibson
2023-06-27 2:54 ` [PATCH 12/27] avocado: Convert build tests to avocado David Gibson
2023-06-27 2:54 ` [PATCH 13/27] tasst: Add helpers for running background commands on sites David Gibson
2023-06-27 2:54 ` [PATCH 14/27] tasst: Add helper to get network interface names for a site David Gibson
2023-06-27 2:54 ` [PATCH 15/27] tasst: Add helpers to run commands with nstool David Gibson
2023-06-27 2:54 ` [PATCH 16/27] tasst: Add ifup and network address helpers to Site David Gibson
2023-06-27 2:54 ` [PATCH 17/27] tasst: Helper for creating veth devices between namespaces David Gibson
2023-06-27 2:54 ` [PATCH 18/27] tasst: Add helper for getting MTU of a network interface David Gibson
2023-06-27 2:54 ` [PATCH 19/27] tasst: Add helper to wait for IP address to appear David Gibson
2023-06-27 2:54 ` [PATCH 20/27] tasst: Add helpers for getting a site's routes David Gibson
2023-06-27 2:54 ` [PATCH 21/27] tasst: Helpers to test transferring data between sites David Gibson
2023-06-27 2:54 ` [PATCH 22/27] tasst: IP address allocation helpers David Gibson
2023-06-27 2:54 ` [PATCH 23/27] tasst: Helpers for running daemons with a pidfile David Gibson
2023-06-27 2:54 ` [PATCH 24/27] tasst: Helpers for testing NDP behaviour David Gibson
2023-06-27 2:54 ` [PATCH 25/27] tasst: Helpers for testing DHCP & DHCPv6 behaviour David Gibson
2023-06-27 2:54 ` [PATCH 26/27] tasst: Helpers to construct a simple network environment for tests David Gibson
2023-06-27 2:54 ` [PATCH 27/27] avocado: Convert basic pasta tests David Gibson
2023-07-05 0:30 ` Stefano Brivio
2023-07-05 3:27 ` David Gibson
2023-07-07 17:42 ` Stefano Brivio
2023-07-10 7:45 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230627025429.2209702-9-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=crosa@redhat.com \
--cc=jarichte@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).