openstack/tempest
Code Issues Proposed changes

Merge "Fixed few typos"

Browse Source
This commit is contained in:
Jenkins
2015-08-28 00:57:32 +00:00
committed by Gerrit Code Review
parent 37fc136ea2 6e1ad567bc
commit 207b6dfc4c
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tempest/api/object_storage/test_container_services.py
View File

@@ -321,7 +321,7 @@ class ContainerTest(base.BaseObjectTest):
self.assertNotIn('x-container-meta-', str(resp)) self.assertNotIn('x-container-meta-', str(resp))
@test.idempotent_id('cf19bc0b-7e16-4a5a-aaed-cb0c2fe8deef') @test.idempotent_id('cf19bc0b-7e16-4a5a-aaed-cb0c2fe8deef')
def test_update_container_metadata_with_create_and_delete_matadata(self): def test_update_container_metadata_with_create_and_delete_metadata(self):
# Send one request of adding and deleting metadata # Send one request of adding and deleting metadata
container_name = data_utils.rand_name(name='TestContainer') container_name = data_utils.rand_name(name='TestContainer')
metadata_1 = {'test-container-meta1': 'Meta1'} metadata_1 = {'test-container-meta1': 'Meta1'}
@@ -379,8 +379,8 @@ class ContainerTest(base.BaseObjectTest):
self.assertNotIn('x-container-meta-test-container-meta1', resp) self.assertNotIn('x-container-meta-test-container-meta1', resp)
@test.idempotent_id('31f40a5f-6a52-4314-8794-cd89baed3040') @test.idempotent_id('31f40a5f-6a52-4314-8794-cd89baed3040')
def test_update_container_metadata_with_create_matadata_key(self): def test_update_container_metadata_with_create_metadata_key(self):
# update container metadata with a blenk value of metadata # update container metadata with a blank value of metadata
container_name = self._create_container() container_name = self._create_container()
metadata = {'test-container-meta1': ''} metadata = {'test-container-meta1': ''}
@@ -395,7 +395,7 @@ class ContainerTest(base.BaseObjectTest):
@test.idempotent_id('a2e36378-6f1f-43f4-840a-ffd9cfd61914') @test.idempotent_id('a2e36378-6f1f-43f4-840a-ffd9cfd61914')
def test_update_container_metadata_with_delete_metadata_key(self): def test_update_container_metadata_with_delete_metadata_key(self):
# update container metadata with a blank value of matadata # update container metadata with a blank value of metadata
container_name = data_utils.rand_name(name='TestContainer') container_name = data_utils.rand_name(name='TestContainer')
metadata = {'test-container-meta1': 'Meta1'} metadata = {'test-container-meta1': 'Meta1'}
self.container_client.create_container(container_name, self.container_client.create_container(container_name,

2
tempest/api/object_storage/test_object_services.py
View File

@@ -811,7 +811,7 @@ class ObjectTest(base.BaseObjectTest):
@test.idempotent_id('aa467252-44f3-472a-b5ae-5b57c3c9c147') @test.idempotent_id('aa467252-44f3-472a-b5ae-5b57c3c9c147')
def test_copy_object_across_containers(self): def test_copy_object_across_containers(self):
# create a container to use as asource container # create a container to use as a source container
src_container_name = data_utils.rand_name(name='TestSourceContainer') src_container_name = data_utils.rand_name(name='TestSourceContainer')
self.container_client.create_container(src_container_name) self.container_client.create_container(src_container_name)
self.containers.append(src_container_name) self.containers.append(src_container_name)

2
tempest/scenario/test_dashboard_basic_ops.py
View File

@@ -88,7 +88,7 @@ class TestDashboardBasicOps(manager.ScenarioTest):
parser = HorizonHTMLParser() parser = HorizonHTMLParser()
parser.feed(response) parser.feed(response)
# construct login url for dashboard, discovery accomodates non-/ web # construct login url for dashboard, discovery accommodates non-/ web
# root for dashboard # root for dashboard
login_url = CONF.dashboard.dashboard_url + parser.login[1:] login_url = CONF.dashboard.dashboard_url + parser.login[1:]

2
tempest/thirdparty/boto/test.py vendored
View File

@@ -377,7 +377,7 @@ class BotoTestCase(tempest.test.BaseTestCase):
state = self.waitSnapshotStatus(lfunction, wait_for) state = self.waitSnapshotStatus(lfunction, wait_for)
self.assertIn(state, wait_for) self.assertIn(state, wait_for)
def assertAddressDissasociatedWait(self, address): def assertAddressDisassociatedWait(self, address):
def _disassociate(): def _disassociate():
cli = self.ec2_client cli = self.ec2_client

2
tempest/thirdparty/boto/test_ec2_instance_run.py vendored
View File

@@ -348,7 +348,7 @@ class InstanceRunTest(boto_test.BotoTestCase):
instance.stop() instance.stop()
address.disassociate() address.disassociate()
self.assertAddressDissasociatedWait(address) self.assertAddressDisassociatedWait(address)
self.cancelResourceCleanUp(rcuk_da) self.cancelResourceCleanUp(rcuk_da)
address.release() address.release()
self.assertAddressReleasedWait(address) self.assertAddressReleasedWait(address)