Revision f398c9b9

b/qa/qa_instance.py
33 33
from ganeti import pathutils
34 34

  
35 35
import qa_config
36
import qa_daemon
36 37
import qa_utils
37 38
import qa_error
38 39

  
......
1158 1159
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
1159 1160
def _TestInstanceUserDownKvm(instance, master):
1160 1161
  def _StopKVMInstance():
1161
    AssertCommand("pkill -f \"kvm -name %s\"" % instance.name, node=primary)
1162
    AssertCommand("pkill -f \"\\-name %s\"" % instance.name, node=primary)
1162 1163
    time.sleep(5)
1163 1164

  
1164 1165
  AssertCommand(["gnt-instance", "modify", "-H", "user_shutdown=true",
......
1182 1183
                   (constants.HT_XEN_HVM, _TestInstanceUserDownXen),
1183 1184
                   (constants.HT_KVM, _TestInstanceUserDownKvm)]:
1184 1185
    if hv in enabled_hypervisors:
1186
      qa_daemon.TestPauseWatcher()
1185 1187
      fn(instance, master)
1188
      qa_daemon.TestResumeWatcher()
1186 1189
    else:
1187 1190
      print "%s hypervisor is not enabled, skipping test for this hypervisor" \
1188 1191
          % hv

Also available in: Unified diff