From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 92C0D5A027A for ; Tue, 27 Jun 2023 04:54:44 +0200 (CEST) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Qqq7J71yyz4wqh; Tue, 27 Jun 2023 12:54:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1687834476; bh=9zhDvqRXE3yOEIwq1ts+AicIPjm7BFk4ePAChQ0FhJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F6qKlEtb5MP6cgSaNesgR23s273dsnZOZBHCndtqKBVGMIM0BHjIS3Hsg5ozsTetw O3cbgqLMffv9C5ij5l/+Sdu/D3mQYDCd8aS4trjIZjp25bRoiSe0btZ0x7xtYbKtVk QtG+V9mAtpTL9gx3OEmv2murljx6P9p4dNMlqcBg= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 11/27] avocado-classless: Allow overriding default timeout Date: Tue, 27 Jun 2023 12:54:12 +1000 Message-ID: <20230627025429.2209702-12-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230627025429.2209702-1-david@gibson.dropbear.id.au> References: <20230627025429.2209702-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6YI7HZPD6F2W5JKGPO2JRKOX3JGL6XZU X-Message-ID-Hash: 6YI7HZPD6F2W5JKGPO2JRKOX3JGL6XZU X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: crosa@redhat.com, jarichte@redhat.com, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Currently the avocado-classless plugin always uses a fixed (short) timeout for tests. However the appropriate timeout really depends on what's being tested. Allow tests to set different timeouts, by placing not a plain function, but an object representing metadata into the classless test manifest. Then tests can use a parameterized version of the decorator to put additional information in that metadata. For now, just add the timeout there, but we might add other things in future. Signed-off-by: David Gibson --- .../avocado_classless/manifest.py | 11 ++++++++--- test/avocado_classless/avocado_classless/plugin.py | 4 +--- test/avocado_classless/avocado_classless/test.py | 14 ++++++++++---- test/avocado_classless/examples.py | 8 +++++++- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/test/avocado_classless/avocado_classless/manifest.py b/test/avocado_classless/avocado_classless/manifest.py index 8f7fe688..34c815cd 100644 --- a/test/avocado_classless/avocado_classless/manifest.py +++ b/test/avocado_classless/avocado_classless/manifest.py @@ -12,6 +12,7 @@ Manage the manifest of classless tests in a module import sys MANIFEST = "__avocado_classless__" +DEFAULT_TIMEOUT = 60.0 def manifest(mod): @@ -24,14 +25,18 @@ def manifest(mod): class ManifestTestInfo: # pylint: disable=R0903 """Metadata about a classless test""" - def __init__(self, func): + def __init__(self, func, timeout=DEFAULT_TIMEOUT): self.func = func + self.__timeout = float(timeout) def run_test(self): self.func() + def timeout(self): + return self.__timeout -def manifest_add(mod, name, func): + +def manifest_add(mod, name, func, **kwargs): """Register a function as a classless test""" if isinstance(mod, str): @@ -40,4 +45,4 @@ def manifest_add(mod, name, func): mfest = manifest(mod) if name in mfest: raise ValueError(f"Duplicate classless test name {name}") - mfest[name] = ManifestTestInfo(func) + mfest[name] = ManifestTestInfo(func, **kwargs) diff --git a/test/avocado_classless/avocado_classless/plugin.py b/test/avocado_classless/avocado_classless/plugin.py index 442642d5..e2c9b1eb 100644 --- a/test/avocado_classless/avocado_classless/plugin.py +++ b/test/avocado_classless/avocado_classless/plugin.py @@ -38,7 +38,6 @@ from avocado.core.utils import messages from .manifest import manifest SHBANG = b'#! /usr/bin/env avocado-runner-avocado-classless' -DEFAULT_TIMEOUT = 5.0 def load_mod(path): @@ -184,7 +183,6 @@ class ClasslessRunner(BaseRunner): process.start() time_started = time.monotonic() - timeout = DEFAULT_TIMEOUT next_status_time = None while True: time.sleep(RUNNER_RUN_CHECK_INTERVAL) @@ -196,7 +194,7 @@ class ClasslessRunner(BaseRunner): ): next_status_time = now + RUNNER_RUN_STATUS_INTERVAL yield messages.RunningMessage.get() - if (now - time_started) > timeout: + if (now - time_started) > testinfo.timeout(): process.terminate() yield messages.FinishedMessage.get("interrupted", "timeout") diff --git a/test/avocado_classless/avocado_classless/test.py b/test/avocado_classless/avocado_classless/test.py index e5251960..04fa52ab 100644 --- a/test/avocado_classless/avocado_classless/test.py +++ b/test/avocado_classless/avocado_classless/test.py @@ -14,10 +14,16 @@ from collections import Counter from .manifest import manifest_add -def test(func): - """Function decorator to mark a function as a classless test""" - manifest_add(func.__module__, func.__name__, func) - return func +def classless_test(**kwargs): + """Mark a function as a classless test with options""" + def dec(func): + manifest_add(func.__module__, func.__name__, func, **kwargs) + return func + return dec + + +# Simple version of classless_test with default options +test = classless_test() def test_output(*tests): diff --git a/test/avocado_classless/examples.py b/test/avocado_classless/examples.py index a0e883f3..8625c9d3 100644 --- a/test/avocado_classless/examples.py +++ b/test/avocado_classless/examples.py @@ -7,8 +7,9 @@ are expected to fail. """ import sys +import time -from avocado_classless.test import test, test_output +from avocado_classless.test import classless_test, test, test_output @test @@ -49,3 +50,8 @@ def positive_fraction(): @test_output(is_integer, is_positive) def negative_fraction(): return -3.5 + + +@classless_test(timeout=1.0) +def timeout(): + time.sleep(3) -- 2.41.0