Revision a47f574c 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_rapi
42 43
import qa_tags
43 44
import qa_utils
44 45

  
......
111 112
  if qa_config.TestEnabled('cluster-master-failover'):
112 113
    RunTest(qa_cluster.TestClusterMasterFailover)
113 114

  
115
  if qa_rapi.Enabled():
116
    RunTest(qa_rapi.TestVersion)
117
    RunTest(qa_rapi.TestEmptyCluster)
114 118

  
115 119
def RunOsTests():
116 120
  """Runs all tests related to gnt-os.
......
160 164
  if qa_config.TestEnabled('node-volumes'):
161 165
    RunTest(qa_node.TestNodeVolumes)
162 166

  
167
  if qa_rapi.Enabled():
168
    RunTest(qa_rapi.TestInstance, instance)
163 169

  
164 170
def RunExportImportTests(instance, pnode):
165 171
  """Tries to export and import the instance.
......
282 288
    if qa_config.TestEnabled('tags'):
283 289
      RunTest(qa_tags.TestNodeTags, pnode)
284 290

  
291
    if qa_rapi.Enabled():
292
      RunTest(qa_rapi.TestNode, pnode)
293

  
285 294
    if qa_config.TestEnabled('instance-add-plain-disk'):
286 295
      instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
287 296
      RunCommonInstanceTests(instance)

Also available in: Unified diff