Revision 5d640672 qa/ganeti-qa.py
b/qa/ganeti-qa.py | ||
---|---|---|
119 | 119 |
try: |
120 | 120 |
if qa_config.TestEnabled('instance-add-plain-disk'): |
121 | 121 |
instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, node) |
122 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
123 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
122 |
|
|
123 |
if qa_config.TestEnabled('instance-shutdown'): |
|
124 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
125 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
124 | 126 |
|
125 | 127 |
if qa_config.TestEnabled('instance-info'): |
126 | 128 |
RunTest(qa_instance.TestInstanceInfo, instance) |
... | ... | |
131 | 133 |
if qa_config.TestEnabled('instance-consecutive-failures'): |
132 | 134 |
RunTest(qa_daemon.TestInstanceConsecutiveFailures, node, instance) |
133 | 135 |
|
136 |
if qa_config.TestEnabled('instance-export'): |
|
137 |
expnode = qa_config.AcquireNode(exclude=node) |
|
138 |
try: |
|
139 |
name = RunTest(qa_instance.TestInstanceExport, instance, expnode) |
|
140 |
|
|
141 |
if qa_config.TestEnabled('instance-import'): |
|
142 |
newinst = qa_config.AcquireInstance() |
|
143 |
try: |
|
144 |
RunTest(qa_instance.TestInstanceImport, node, newinst, |
|
145 |
expnode, name) |
|
146 |
RunTest(qa_instance.TestInstanceRemove, newinst) |
|
147 |
finally: |
|
148 |
qa_config.ReleaseInstance(newinst) |
|
149 |
finally: |
|
150 |
qa_config.ReleaseNode(expnode) |
|
151 |
|
|
134 | 152 |
if qa_config.TestEnabled('node-volumes'): |
135 | 153 |
RunTest(qa_node.TestNodeVolumes) |
136 | 154 |
|
... | ... | |
139 | 157 |
|
140 | 158 |
if qa_config.TestEnabled('instance-add-local-mirror-disk'): |
141 | 159 |
instance = RunTest(qa_instance.TestInstanceAddWithLocalMirrorDisk, node) |
142 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
143 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
160 |
|
|
161 |
if qa_config.TestEnabled('instance-shutdown'): |
|
162 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
163 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
144 | 164 |
|
145 | 165 |
if qa_config.TestEnabled('instance-info'): |
146 | 166 |
RunTest(qa_instance.TestInstanceInfo, instance) |
... | ... | |
156 | 176 |
try: |
157 | 177 |
instance = RunTest(qa_instance.TestInstanceAddWithRemoteRaidDisk, |
158 | 178 |
node, node2) |
159 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
160 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
179 |
|
|
180 |
if qa_config.TestEnabled('instance-shutdown'): |
|
181 |
RunTest(qa_instance.TestInstanceShutdown, instance) |
|
182 |
RunTest(qa_instance.TestInstanceStartup, instance) |
|
161 | 183 |
|
162 | 184 |
if qa_config.TestEnabled('instance-info'): |
163 | 185 |
RunTest(qa_instance.TestInstanceInfo, instance) |
Also available in: Unified diff