On 30 January 2013 12:46, Bernardo Dal Seno <[email protected]> wrote:
> Instance tests are run with or without the exclusive-storage flag set. More
> configurations can be added easily.
>
> Signed-off-by: Bernardo Dal Seno <[email protected]>
> ---
> qa/ganeti-qa.py | 85
> ++++++++++++++++++++++++++++++++-----------------------
> qa/qa-sample.json | 6 +++-
> 2 files changed, 55 insertions(+), 36 deletions(-)
Interdiff, due to the (first) interdiff of 3/17:
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 7fc2359..2f7de3a 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -576,16 +576,16 @@ def RunQa():
qa_config.ReleaseNode(pnode)
config_list = [
- ("default-instance-tests", lambda: None, lambda: None),
+ ("default-instance-tests", lambda: None, lambda _: None),
("exclusive-storage-instance-tests",
lambda: qa_cluster.TestSetExclStorCluster(True),
- lambda: qa_cluster.TestSetExclStorCluster(False)),
+ qa_cluster.TestSetExclStorCluster),
]
for (conf_name, setup_conf_f, restore_conf_f) in config_list:
if qa_config.TestEnabled(conf_name):
- setup_conf_f()
+ oldconf = setup_conf_f()
RunInstanceTests()
- restore_conf_f()
+ restore_conf_f(oldconf)
pnode = qa_config.AcquireNode()
try:
Bernardo
