Revision 8201b996 qa/ganeti-qa.py

b/qa/ganeti-qa.py
105 105
  else:
106 106
    # consider the nodes are already there
107 107
    qa_node.MarkNodeAddedAll()
108

  
109
  # enable the watcher (unconditionally)
110
  RunTest(qa_daemon.TestResumeWatcher)
111

  
108 112
  if qa_config.TestEnabled('node-info'):
109 113
    RunTest(qa_node.TestNodeInfo)
110 114

  
......
274 278
  consecutive_failures = \
275 279
    qa_config.TestEnabled('instance-consecutive-failures')
276 280

  
281
  RunTest(qa_daemon.TestPauseWatcher)
277 282
  if automatic_restart or consecutive_failures:
278
    qa_daemon.PrintCronWarning()
279 283

  
280 284
    if automatic_restart:
281 285
      RunTest(qa_daemon.TestInstanceAutomaticRestart, pnode, instance)
......
283 287
    if consecutive_failures:
284 288
      RunTest(qa_daemon.TestInstanceConsecutiveFailures, pnode, instance)
285 289

  
290
  RunTest(qa_daemon.TestResumeWatcher)
291

  
286 292

  
287 293
def RunHardwareFailureTests(instance, pnode, snode):
288 294
  """Test cluster internal hardware failure recovery.
......
349 355
  SetupCluster(rapi_user, rapi_secret)
350 356

  
351 357
  # Load RAPI certificate
352
  qa_rapi.Setup(rapi_user, rapi_secret)
358
  #qa_rapi.Setup(rapi_user, rapi_secret)
353 359

  
354 360
  RunClusterTests()
355 361
  RunOsTests()

Also available in: Unified diff