Commit b2525349 authored by Thomas Thrainer's avatar Thomas Thrainer
Browse files

Disable failing QA test



See issue 516 for an explanation of the problem, and why it was required
to disable this test.
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 2b5b6da1
...@@ -33,7 +33,6 @@ from ganeti import utils ...@@ -33,7 +33,6 @@ from ganeti import utils
from ganeti import pathutils from ganeti import pathutils
import qa_config import qa_config
import qa_daemon
import qa_utils import qa_utils
import qa_error import qa_error
import qa_instance import qa_instance
...@@ -348,42 +347,46 @@ def TestClusterVerify(): ...@@ -348,42 +347,46 @@ def TestClusterVerify():
AssertCommand(["gnt-cluster", "verify-disks"]) AssertCommand(["gnt-cluster", "verify-disks"])
# pylint: disable=W0613
def TestClusterVerifyDisksBrokenDRBD(instance, inst_nodes): def TestClusterVerifyDisksBrokenDRBD(instance, inst_nodes):
"""gnt-cluster verify-disks with broken DRBD""" """gnt-cluster verify-disks with broken DRBD"""
qa_daemon.TestPauseWatcher() pass
try: # FIXME (thomasth): reenable once it works (see issue 516!)
info = qa_instance.GetInstanceInfo(instance.name) # qa_daemon.TestPauseWatcher()
snode = inst_nodes[1] #
for idx, minor in enumerate(info["drbd-minors"][snode.primary]): # try:
if idx % 2 == 0: # info = qa_instance.GetInstanceInfo(instance.name)
break_drbd_cmd = \ # snode = inst_nodes[1]
"(drbdsetup %d down >/dev/null 2>&1;" \ # for idx, minor in enumerate(info["drbd-minors"][snode.primary]):
" drbdsetup down resource%d >/dev/null 2>&1) || /bin/true" % \ # if idx % 2 == 0:
(minor, minor) # break_drbd_cmd = \
else: # "(drbdsetup %d down >/dev/null 2>&1;" \
break_drbd_cmd = \ # " drbdsetup down resource%d >/dev/null 2>&1) || /bin/true" % \
"(drbdsetup %d detach >/dev/null 2>&1;" \ # (minor, minor)
" drbdsetup detach %d >/dev/null 2>&1) || /bin/true" % \ # else:
(minor, minor) # break_drbd_cmd = \
AssertCommand(break_drbd_cmd, node=snode) # "(drbdsetup %d detach >/dev/null 2>&1;" \
# " drbdsetup detach %d >/dev/null 2>&1) || /bin/true" % \
verify_output = GetCommandOutput(qa_config.GetMasterNode().primary, # (minor, minor)
"gnt-cluster verify-disks") # AssertCommand(break_drbd_cmd, node=snode)
activation_msg = "Activating disks for instance '%s'" % instance.name #
if activation_msg not in verify_output: # verify_output = GetCommandOutput(qa_config.GetMasterNode().primary,
raise qa_error.Error("gnt-cluster verify-disks did not activate broken" # "gnt-cluster verify-disks")
" DRBD disks:\n%s" % verify_output) # activation_msg = "Activating disks for instance '%s'" % instance.name
# if activation_msg not in verify_output:
verify_output = GetCommandOutput(qa_config.GetMasterNode().primary, # raise qa_error.Error("gnt-cluster verify-disks did not activate broken"
"gnt-cluster verify-disks") # " DRBD disks:\n%s" % verify_output)
if activation_msg in verify_output: #
raise qa_error.Error("gnt-cluster verify-disks wants to activate broken" # verify_output = GetCommandOutput(qa_config.GetMasterNode().primary,
" DRBD disks on second attempt:\n%s" % verify_output) # "gnt-cluster verify-disks")
# if activation_msg in verify_output:
AssertCommand(_CLUSTER_VERIFY) # raise qa_error.Error("gnt-cluster verify-disks wants to activate broken"
finally: # " DRBD disks on second attempt:\n%s" % verify_output)
qa_daemon.TestResumeWatcher() #
# AssertCommand(_CLUSTER_VERIFY)
# finally:
# qa_daemon.TestResumeWatcher()
def TestJobqueue(): def TestJobqueue():
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment