Revision d74c2ca1 qa/ganeti-qa.py

b/qa/ganeti-qa.py
39 39
import qa_node
40 40
import qa_os
41 41
import qa_other
42
import qa_tags
42 43

  
43 44

  
44 45
def RunTest(fn, *args):
......
140 141
    RunTest(qa_instance.TestInstanceReinstall, instance)
141 142
    RunTest(qa_instance.TestInstanceStartup, instance)
142 143

  
144
  if qa_config.TestEnabled('tags'):
145
    RunTest(qa_tags.TestInstanceTags, instance)
146

  
143 147
  if qa_config.TestEnabled('node-volumes'):
144 148
    RunTest(qa_node.TestNodeVolumes)
145 149

  
......
240 244
  RunClusterTests()
241 245
  RunOsTests()
242 246

  
247
  if qa_config.TestEnabled('tags'):
248
    RunTest(qa_tags.TestClusterTags)
249

  
243 250
  pnode = qa_config.AcquireNode()
244 251
  try:
252
    if qa_config.TestEnabled('tags'):
253
      RunTest(qa_tags.TestNodeTags, pnode)
254

  
245 255
    if qa_config.TestEnabled('instance-add-plain-disk'):
246 256
      instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
247 257
      RunCommonInstanceTests(instance)

Also available in: Unified diff