While previous patches enabled QA tests of exports in instance moves,
this patch does the same for local exports.
Signed-off-by: Hrvoje Ribicic <r...@google.com>
---
qa/ganeti-qa.py | 3 +--
qa/qa_instance.py | 9 ++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 4c7ff2f..8572cd3 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -469,8 +469,7 @@ def RunExportImportTests(instance, inodes):
# FIXME: export explicitly bails out on file based storage. other non-lvm
# based storage types are untested, though. Also note that import could still
# work, but is deeply embedded into the "export" case.
- if (qa_config.TestEnabled("instance-export") and
- instance.disk_template not in constants.DTS_FILEBASED):
+ if qa_config.TestEnabled("instance-export"):
RunTest(qa_instance.TestInstanceExportNoTarget, instance)
pnode = inodes[0]
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index e997701..18df485 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -1073,10 +1073,13 @@ def TestRecreateDisks(instance, inodes, othernodes):
def TestInstanceExport(instance, node):
"""gnt-backup export -n ..."""
name = instance.name
- # Export does not work for file-based templates, thus we skip the test
+ options = ["gnt-backup", "export", "-n", node.primary]
+
+ # For files and shared files, the --long-sleep option should be used
if instance.disk_template in [constants.DT_FILE, constants.DT_SHARED_FILE]:
- return
- AssertCommand(["gnt-backup", "export", "-n", node.primary, name])
+ options.append("--long-sleep")
+
+ AssertCommand(options + [name])
return qa_utils.ResolveInstanceName(name)
--
2.2.0.rc0.207.ga3a616c
