Skip to content

Commit fce58c5

Browse files
committed
Annotate old stacktester tests so that they get run by run_tests.sh --whatever
1 parent f1bd053 commit fce58c5

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

kong/tests/test_flavors.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def test_show_flavor(self):
7373
for flavor in flavors:
7474
detailed_flavor = self._show_flavor(flavor['id'])
7575
self._assert_flavor_entity_detailed(detailed_flavor)
76+
test_show_flavor.tags = ['nova', 'glance']
7677

7778
def test_index_flavors_basic(self):
7879
"""List all flavors"""
@@ -81,6 +82,7 @@ def test_index_flavors_basic(self):
8182

8283
for flavor in flavors:
8384
self._assert_flavor_entity_basic(flavor)
85+
test_index_flavors_basic.tags = ['nova', 'glance']
8486

8587
def test_index_flavors_detailed(self):
8688
"""List all flavors in detail"""
@@ -94,3 +96,4 @@ def test_index_flavors_detailed(self):
9496

9597
for flavor in flavors:
9698
self._assert_flavor_entity_detailed(flavor)
99+
test_index_flavors_detailed.tags = ['nova', 'glance']

kong/tests/test_images.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ def test_index(self):
7474

7575
for image in resp_body['images']:
7676
self._assert_image_entity_basic(image)
77+
test_index.tags = ['nova', 'glance']
7778

7879
def test_detail(self):
7980
"""List all images in detail"""
@@ -86,3 +87,4 @@ def test_detail(self):
8687

8788
for image in resp_body['images']:
8889
self._assert_image_entity_detailed(image)
90+
test_detail.tags = ['nova', 'glance']

kong/tests/test_server_actions.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def test_reboot_server_soft(self):
109109
# SSH and verify uptime is less than before
110110
post_reboot_time_started = self._get_boot_time()
111111
self.assertTrue(initial_time_started < post_reboot_time_started)
112+
test_reboot_server_soft.tags = ['nova']
112113

113114
def test_reboot_server_hard(self):
114115
"""Reboot a server (HARD)"""
@@ -132,6 +133,7 @@ def test_reboot_server_hard(self):
132133
# SSH and verify uptime is less than before
133134
post_reboot_time_started = self._get_boot_time()
134135
self.assertTrue(initial_time_started < post_reboot_time_started)
136+
test_reboot_server_hard.tags = ['nova']
135137

136138
def test_change_server_password(self):
137139
"""Change root password of a server"""
@@ -152,6 +154,7 @@ def test_change_server_password(self):
152154

153155
# SSH into server using new password
154156
self._assert_ssh_password('test123')
157+
test_change_server_password.tags = ['nova']
155158

156159
def test_rebuild(self):
157160
"""Rebuild a server"""
@@ -236,6 +239,7 @@ def test_rebuild(self):
236239

237240
# make sure file is gone
238241
self.assertEqual(self._read_file(FILENAME, specified_password), '')
242+
test_rebuild.tags = ['nova']
239243

240244
@unittest.skipIf(not multi_node, 'Multiple compute nodes required')
241245
def test_resize_server_confirm(self):
@@ -270,6 +274,7 @@ def test_resize_server_confirm(self):
270274
# Ensure API still reports new flavor
271275
server = self.os.nova.get_server(self.server_id)
272276
self.assertEqual(self.flavor_ref_alt, server['flavor']['id'])
277+
test_resize_server_confirm.tags = ['nova']
273278

274279
@unittest.skipIf(not multi_node, 'Multiple compute nodes required')
275280
def test_resize_server_revert(self):
@@ -305,6 +310,7 @@ def test_resize_server_revert(self):
305310
# Ensure flavor ref was reverted to original
306311
server = self.os.nova.get_server(self.server_id)
307312
self.assertEqual(self.flavor_ref, server['flavor']['id'])
313+
test_resize_server_revert.tags = ['nova']
308314

309315

310316
class SnapshotTests(unittest.TestCase):
@@ -366,6 +372,7 @@ def test_snapshot_server_active(self):
366372

367373
# Cleaning up
368374
self.os.nova.request('DELETE', '/images/%s' % snapshot_id)
375+
test_snapshot_server_active.tags = ['nova', 'glance']
369376

370377
def test_snapshot_server_inactive(self):
371378
"""Ensure inability to snapshot server in BUILD state"""
@@ -381,3 +388,4 @@ def test_snapshot_server_inactive(self):
381388
snapshot_id = response['location'].rsplit('/', 1)[1]
382389
# Delete image for now, won't need this once correct status code is in
383390
self.os.nova.request('DELETE', '/images/%s' % snapshot_id)
391+
test_snapshot_server_inactive.tags = ['nova', 'glance']

kong/tests/test_servers.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ def test_build_server(self):
118118
self.assertTrue(client.test_connection_auth())
119119

120120
self.os.nova.delete_server(server['id'])
121+
test_build_server.tags = ['nova', 'glance']
121122

122123
def test_build_server_with_file(self):
123124
"""Build a server with an injected file"""
@@ -176,6 +177,7 @@ def test_build_server_with_file(self):
176177
self.assertEqual(injected_file, file_contents)
177178

178179
self.os.nova.delete_server(server['id'])
180+
test_build_server_with_file.tags = ['nova', 'glance']
179181

180182
def test_build_server_with_password(self):
181183
"""Build a server with a password"""
@@ -229,6 +231,7 @@ def test_build_server_with_password(self):
229231
self.assertTrue(client.test_connection_auth())
230232

231233
self.os.nova.delete_server(server['id'])
234+
test_build_server_with_password.tags = ['nova', 'glance']
232235

233236
def test_delete_server_building(self):
234237
"""Delete a server while building"""
@@ -253,6 +256,7 @@ def test_delete_server_building(self):
253256
self.os.nova.poll_request_status('GET', url, 404)
254257
except exceptions.TimeoutException:
255258
self.fail("Server deletion timed out")
259+
test_delete_server_building.tags = ['nova', 'glance']
256260

257261
def test_delete_server_active(self):
258262
"""Delete a server after fully built"""
@@ -278,6 +282,7 @@ def test_delete_server_active(self):
278282
self.os.nova.poll_request_status('GET', url, 404)
279283
except exceptions.TimeoutException:
280284
self.fail("Server deletion timed out")
285+
test_delete_server_active.tags = ['nova', 'glance']
281286

282287
def test_update_server_name(self):
283288
"""Change the name of a server"""
@@ -321,6 +326,7 @@ def test_update_server_name(self):
321326
self.assertEqual('updatedtestserver', data['server']['name'])
322327

323328
self.os.nova.delete_server(server_id)
329+
test_update_server_name.tags = ['nova', 'glance']
324330

325331
def test_create_server_invalid_image(self):
326332
"""Create a server with an unknown image"""
@@ -346,6 +352,7 @@ def test_create_server_invalid_image(self):
346352
}
347353
# KNOWN-ISSUE - The error message is confusing and should be improved
348354
#self.assertEqual(fault, expected_fault)
355+
test_create_server_invalid_image.tags = ['nova', 'glance']
349356

350357
def test_create_server_invalid_flavor(self):
351358
"""Create a server with an unknown flavor"""
@@ -371,3 +378,4 @@ def test_create_server_invalid_flavor(self):
371378
}
372379
# KNOWN-ISSUE lp804084
373380
#self.assertEqual(fault, expected_fault)
381+
test_create_server_invalid_flavor.tags = ['nova', 'glance']

0 commit comments

Comments
 (0)