objects: add configuration upgrade system

[ganeti-local] / qa / qa_daemon.py

diff --git a/qa/qa_daemon.py b/qa/qa_daemon.py
index 7223068..4817bfe 100644 (file)
--- a/qa/qa_daemon.py
+++ b/qa/qa_daemon.py
@@ -1,3 +1,6 @@
+#
+#
+

 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify

@@ -95,13 +98,12 @@ def PrintCronWarning():
   """Shows a warning about the cron job.
 
   """
   """Shows a warning about the cron job.
 
   """

-  msg = ("For the following tests it's recommended to turn off the "
-         "ganeti-watcher cronjob.")
+  msg = ("For the following tests it's recommended to turn off the"
+         " ganeti-watcher cronjob.")

   print
   print qa_utils.FormatWarning(msg)
 
 
   print
   print qa_utils.FormatWarning(msg)
 
 

-@qa_utils.DefineHook('daemon-automatic-restart')

 def TestInstanceAutomaticRestart(node, instance):
   """Test automatic restart of instance by ganeti-watcher.
 
 def TestInstanceAutomaticRestart(node, instance):
   """Test automatic restart of instance by ganeti-watcher.
 

@@ -123,7 +125,6 @@ def TestInstanceAutomaticRestart(node, instance):
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
 
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
 

-@qa_utils.DefineHook('daemon-consecutive-failures')

 def TestInstanceConsecutiveFailures(node, instance):
   """Test five consecutive instance failures.
 
 def TestInstanceConsecutiveFailures(node, instance):
   """Test five consecutive instance failures.