public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
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 09/27] avocado-classless: Test matrices by composition
Date: Tue, 27 Jun 2023 12:54:10 +1000	[thread overview]
Message-ID: <20230627025429.2209702-10-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230627025429.2209702-1-david@gibson.dropbear.id.au>

It's sometimes useful to have a batch of tests to be run in a variety of
different scenarios.  In particular it's sometimes useful to reuse those
tests for scenarios that aren't known at the time of writing the tests.

Introduce the 'test_output' decorator.  This creates a number of tests by
feeding the output of the decorated function (representing the scenario
setup) into all of the listed tests.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 .../avocado_classless/test.py                 | 13 ++++++++
 test/avocado_classless/examples.py            | 31 ++++++++++++++++++-
 test/avocado_classless/selftests.py           | 15 ++++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/test/avocado_classless/avocado_classless/test.py b/test/avocado_classless/avocado_classless/test.py
index 0602f9c9..e5251960 100644
--- a/test/avocado_classless/avocado_classless/test.py
+++ b/test/avocado_classless/avocado_classless/test.py
@@ -19,6 +19,19 @@ def test(func):
     manifest_add(func.__module__, func.__name__, func)
     return func
 
+
+def test_output(*tests):
+    """Decorate a function to test its output with a list of other functions"""
+    def dec(func):
+        for testfn in tests:
+            manifest_add(func.__module__,
+                         f"{testfn.__name__}∘{func.__name__}",
+                         lambda testfn=testfn: testfn(func()))
+
+        return func
+    return dec
+
+
 #
 # Assertion helpers without unnecessary OOP nonsense
 #
diff --git a/test/avocado_classless/examples.py b/test/avocado_classless/examples.py
index a4856124..a0e883f3 100644
--- a/test/avocado_classless/examples.py
+++ b/test/avocado_classless/examples.py
@@ -8,7 +8,7 @@ are expected to fail.
 
 import sys
 
-from avocado_classless.test import test
+from avocado_classless.test import test, test_output
 
 
 @test
@@ -20,3 +20,32 @@ def trivial_pass():
 def trivial_fail():
     print("Fails, trivially", file=sys.stderr)
     assert False
+
+
+# Some test_output checks
+def is_integer(val):
+    assert isinstance(val, int)
+
+
+def is_positive(val):
+    assert val > 0
+
+
+@test_output(is_integer, is_positive)
+def positive_integer():
+    return 17
+
+
+@test_output(is_integer, is_positive)
+def negative_integer():
+    return -17
+
+
+@test_output(is_integer, is_positive)
+def positive_fraction():
+    return 3.5
+
+
+@test_output(is_integer, is_positive)
+def negative_fraction():
+    return -3.5
diff --git a/test/avocado_classless/selftests.py b/test/avocado_classless/selftests.py
index 12a4a5a2..6b6d40ff 100644
--- a/test/avocado_classless/selftests.py
+++ b/test/avocado_classless/selftests.py
@@ -8,7 +8,7 @@ import types
 
 from avocado_classless.manifest import manifest_add
 from avocado_classless.test import (
-    assert_eq, assert_eq_unordered, assert_in, assert_raises, test
+    assert_eq, assert_eq_unordered, assert_in, assert_raises, test, test_output
 )
 
 
@@ -61,3 +61,16 @@ def test_double_register():
         manifest_add(mod, "test", trivial)
         manifest_add(mod, "test", assert_true)
     assert_raises(ValueError, double_register)
+
+
+def is_int(val):
+    assert isinstance(val, int)
+
+
+def is_positive(val):
+    assert val > 0
+
+
+@test_output(is_int, is_positive)
+def seventeen():
+    return 17
-- 
@@ -8,7 +8,7 @@ import types
 
 from avocado_classless.manifest import manifest_add
 from avocado_classless.test import (
-    assert_eq, assert_eq_unordered, assert_in, assert_raises, test
+    assert_eq, assert_eq_unordered, assert_in, assert_raises, test, test_output
 )
 
 
@@ -61,3 +61,16 @@ def test_double_register():
         manifest_add(mod, "test", trivial)
         manifest_add(mod, "test", assert_true)
     assert_raises(ValueError, double_register)
+
+
+def is_int(val):
+    assert isinstance(val, int)
+
+
+def is_positive(val):
+    assert val > 0
+
+
+@test_output(is_int, is_positive)
+def seventeen():
+    return 17
-- 
2.41.0


  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 ` [PATCH 08/27] tasst, avocado: Introduce library of common test helpers David Gibson
2023-06-27  2:54 ` David Gibson [this message]
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-10-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).