From 741c6d910dc753376734cb53d19e35bccc9fbed4 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 10 May 2012 08:15:48 +0200
Subject: [PATCH] QA: Support passing keyword arguments to test functions
Until now this wasn't possible.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/ganeti-qa.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index ec964203e..ddf11fc93 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -72,7 +72,7 @@ def _DescriptionOf(fn):
return desc.rstrip(".")
-def RunTest(fn, *args):
+def RunTest(fn, *args, **kwargs):
"""Runs a test after printing a header.
"""
@@ -85,7 +85,7 @@ def RunTest(fn, *args):
print _FormatHeader("%s start %s" % (tstart, desc))
try:
- retval = fn(*args)
+ retval = fn(*args, **kwargs)
return retval
finally:
tstop = datetime.datetime.now()
@@ -93,7 +93,7 @@ def RunTest(fn, *args):
print _FormatHeader("%s time=%s %s" % (tstop, tdelta, desc))
-def RunTestIf(testnames, fn, *args):
+def RunTestIf(testnames, fn, *args, **kwargs):
"""Runs a test conditionally.
@param testnames: either a single test name in the configuration
@@ -101,7 +101,7 @@ def RunTestIf(testnames, fn, *args):
"""
if qa_config.TestEnabled(testnames):
- RunTest(fn, *args)
+ RunTest(fn, *args, **kwargs)
else:
tstart = datetime.datetime.now()
desc = _DescriptionOf(fn)
--
GitLab