Skip to content

Commit

Permalink
Refactor compute image tests
Browse files Browse the repository at this point in the history 
Several test cases are combined to use a single server instance instead of
creating dozens of servers.

Bug: #1010980

Change-Id: I4af98ccf53c666ba38630fc3e79a2b3811ede595
  • Loading branch information
@afazekas
afazekas committed Jan 12, 2013
1 parent a519e1c commit 46a1d92
Show file tree
Hide file tree
Showing 2 changed files with 243 additions and 167 deletions.
171 changes: 4 additions & 167 deletions tempest/tests/compute/images/test_images.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,6 @@ def tearDown(self):
self.client.delete_image(image_id)
self.image_ids.remove(image_id)

@attr(type='smoke')
@unittest.skipUnless(compute.CREATE_IMAGE_ENABLED,
'Environment unable to create images.')
def test_create_delete_image(self):
# An image for the provided server should be created
server_name = rand_name('server')
resp, server = self.servers_client.create_server(server_name,
self.image_ref,
self.flavor_ref)
self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')

# Create a new image
name = rand_name('image')
meta = {'image_type': 'test'}
resp, body = self.client.create_image(server['id'], name, meta)
self.assertEqual(202, resp.status)
image_id = parse_image_id(resp['location'])
self.client.wait_for_image_resp_code(image_id, 200)
self.client.wait_for_image_status(image_id, 'ACTIVE')

# Verify the image was created correctly
resp, image = self.client.get_image(image_id)
self.assertEqual(name, image['name'])
self.assertEqual('test', image['metadata']['image_type'])

# Verify minRAM and minDisk values are the same as the original image
resp, original_image = self.client.get_image(self.image_ref)
self.assertEqual(original_image['minRam'], image['minRam'])
self.assertEqual(original_image['minDisk'], image['minDisk'])

# Teardown
self.client.delete_image(image['id'])
self.servers_client.delete_server(server['id'])

@attr(type='negative')
def test_create_image_from_deleted_server(self):
# An image should not be created if the server instance is removed
Expand Down Expand Up @@ -126,13 +92,13 @@ def test_create_image_from_invalid_server(self):
"with invalid server id")

@attr(type='negative')
@unittest.skipUnless(compute.MULTI_USER, 'Second user not configured')
def test_create_image_for_server_in_another_tenant(self):
# Creating image of another tenant's server should be return error
def test_create_image_when_server_is_terminating(self):
# Return an error when creating image of server that is terminating
server = self.create_server()
self.servers_client.delete_server(server['id'])

snapshot_name = rand_name('test-snap-')
self.assertRaises(exceptions.NotFound, self.alt_client.create_image,
self.assertRaises(exceptions.Duplicate, self.client.create_image,
server['id'], snapshot_name)

@attr(type='negative')
Expand All @@ -158,52 +124,6 @@ def test_create_image_when_server_is_rebooting(self):
self.assertRaises(exceptions.Duplicate, self.client.create_image,
server['id'], snapshot_name)

@attr(type='negative')
def test_create_image_when_server_is_terminating(self):
# Return an error when creating image of server that is terminating
server = self.create_server()
self.servers_client.delete_server(server['id'])

snapshot_name = rand_name('test-snap-')
self.assertRaises(exceptions.Duplicate, self.client.create_image,
server['id'], snapshot_name)

@attr(type='negative')
def test_create_second_image_when_first_image_is_being_saved(self):
# Disallow creating another image when first image is being saved
server = self.create_server()

try:
# Create first snapshot
snapshot_name = rand_name('test-snap-')
resp, body = self.client.create_image(server['id'], snapshot_name)
image_id = parse_image_id(resp['location'])
self.image_ids.append(image_id)

# Create second snapshot
alt_snapshot_name = rand_name('test-snap-')
self.client.create_image(server['id'], alt_snapshot_name)
except exceptions.Duplicate:
pass

else:
self.fail("Should allow creating an image when another image of"
"the server is still being saved")

@attr(type='negative')
@unittest.skip("Until Bug 1004564 is fixed")
def test_create_image_specify_name_over_256_chars(self):
# Return an error if snapshot name over 256 characters is passed
server = self.create_server()

try:
snapshot_name = rand_name('a' * 260)
self.assertRaises(exceptions.BadRequest, self.client.create_image,
server['id'], snapshot_name)
except Exception:
self.fail("Should return 400 Bad Request if image name is over 256"
" characters")

@attr(type='negative')
def test_create_image_specify_uuid_35_characters_or_less(self):
# Return an error if Image ID passed is 35 characters or less
Expand All @@ -228,51 +148,6 @@ def test_create_image_specify_uuid_37_characters_or_more(self):
self.fail("Should return 404 Not Found if server uuid is 37"
" characters or more")

@attr(type='negative')
@unittest.skip("Until Bug 1006725 is fixed")
def test_create_image_specify_multibyte_character_image_name(self):
# Return an error if the image name has multi-byte characters
server = self.create_server()

try:
snapshot_name = rand_name('\xef\xbb\xbf')
self.assertRaises(exceptions.BadRequest,
self.client.create_image, server['id'],
snapshot_name)
except Exception:
self.fail("Should return 400 Bad Request if multi byte characters"
" are used for image name")

@attr(type='negative')
@unittest.skip("Until Bug 1005423 is fixed")
def test_create_image_specify_invalid_metadata(self):
# Return an error when creating image with invalid metadata
server = self.create_server()

try:
snapshot_name = rand_name('test-snap-')
meta = {'': ''}
self.assertRaises(exceptions.BadRequest, self.client.create_image,
server['id'], snapshot_name, meta)

except Exception:
self.fail("Should raise 400 Bad Request if meta data is invalid")

@attr(type='negative')
@unittest.skip("Until Bug 1005423 is fixed")
def test_create_image_specify_metadata_over_limits(self):
# Return an error when creating image with meta data over 256 chars
server = self.create_server()

try:
snapshot_name = rand_name('test-snap-')
meta = {'a' * 260: 'b' * 260}
self.assertRaises(exceptions.OverLimit, self.client.create_image,
server['id'], snapshot_name, meta)

except Exception:
self.fail("Should raise 413 Over Limit if meta data was too long")

@attr(type='negative')
def test_delete_image_with_invalid_image_id(self):
# An image should not be deleted with invalid image id
Expand Down Expand Up @@ -337,42 +212,6 @@ def test_delete_image_id_is_over_35_character_limit(self):
self.fail("Did not return HTTP 404 NotFound for image id that "
"exceeds 35 character ID length limit")

@attr(type='negative')
@unittest.skipUnless(compute.MULTI_USER, 'Second user not configured')
def test_delete_image_of_another_tenant(self):
# Return an error while trying to delete another tenant's image

server = self.create_server()

snapshot_name = rand_name('test-snap-')
resp, body = self.client.create_image(server['id'], snapshot_name)
image_id = parse_image_id(resp['location'])
self.image_ids.append(image_id)
self.client.wait_for_image_resp_code(image_id, 200)
self.client.wait_for_image_status(image_id, 'ACTIVE')

# Delete image
self.assertRaises(exceptions.NotFound,
self.alt_client.delete_image, image_id)

@attr(type='negative')
def test_delete_image_that_is_not_yet_active(self):
# Return an error while trying to delete an active that is creating

server = self.create_server()

snapshot_name = rand_name('test-snap-')
resp, body = self.client.create_image(server['id'], snapshot_name)
image_id = parse_image_id(resp['location'])
self.image_ids.append(image_id)

# Do not wait, attempt to delete the image, ensure it's successful
resp, body = self.client.delete_image(image_id)
self.assertEqual('204', resp['status'])
self.image_ids.remove(image_id)

self.assertRaises(exceptions.NotFound, self.client.get_image, image_id)


class ImagesTestJSON(base.BaseComputeTestJSON,
ImagesTestBase):
Expand All @@ -381,7 +220,6 @@ def tearDown(self):

@classmethod
def setUpClass(cls):
raise nose.SkipTest("Until Bug 1046870 is fixed")
super(ImagesTestJSON, cls).setUpClass()
cls.client = cls.images_client
cls.servers_client = cls.servers_client
Expand All @@ -408,7 +246,6 @@ def tearDown(self):

@classmethod
def setUpClass(cls):
raise nose.SkipTest("Until Bug 1046870 is fixed")
super(ImagesTestXML, cls).setUpClass()
cls.client = cls.images_client
cls.servers_client = cls.servers_client
Expand Down

0 comments on commit 46a1d92

Please sign in to comment.