Revision 23269c5b qa/ganeti-qa.py

b/qa/ganeti-qa.py
136 136
      if qa_config.TestEnabled('instance-info'):
137 137
        RunTest(qa_instance.TestInstanceInfo, instance)
138 138

  
139
      if qa_config.TestEnabled('instance-automatic-restart'):
140
        RunTest(qa_daemon.TestInstanceAutomaticRestart, node, instance)
139
      automatic_restart = \
140
        qa_config.TestEnabled('instance-automatic-restart')
141
      consecutive_failures = \
142
        qa_config.TestEnabled('instance-consecutive-failures')
141 143

  
142
      if qa_config.TestEnabled('instance-consecutive-failures'):
143
        RunTest(qa_daemon.TestInstanceConsecutiveFailures, node, instance)
144
      if automatic_restart or consecutive_failures:
145
        qa_daemon.PrintCronWarning()
146

  
147
        if automatic_restart:
148
          RunTest(qa_daemon.TestInstanceAutomaticRestart, node, instance)
149

  
150
        if consecutive_failures:
151
          RunTest(qa_daemon.TestInstanceConsecutiveFailures, node, instance)
144 152

  
145 153
      if qa_config.TestEnabled('instance-export'):
146 154
        expnode = qa_config.AcquireNode(exclude=node)

Also available in: Unified diff