From 0b85e1bdfecb91b6d1f0ee2b3e93e10800e6544e Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Sat, 6 Apr 2013 20:45:20 +0200
Subject: [PATCH] qa: fix modify primary test
This test uses a non-existing config value "file-storage-dir" and fails.
Fixing it by using the default value, which is currently what qa does.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>
---
qa/qa_instance.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index ecfed23aa..9dbe5deca 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -611,7 +611,9 @@ def TestInstanceModifyPrimaryAndBack(instance, currentnode, othernode):
current = currentnode.primary
other = othernode.primary
- filestorage = qa_config.get("file-storage-dir")
+ # FIXME: the qa doesn't have a customizable file storage dir parameter. As
+ # such for now we use the default.
+ filestorage = pathutils.DEFAULT_FILE_STORAGE_DIR
disk = os.path.join(filestorage, name)
AssertCommand(["gnt-instance", "modify", "--new-primary=%s" % other, name],
--
GitLab