Fixes typos in tempest/api
Just some typos
Change-Id: I062b60e6b20bb116547f613556cf976d58f81d40
diff --git a/tempest/api/compute/admin/test_availability_zone.py b/tempest/api/compute/admin/test_availability_zone.py
index 8a56b89..d1e1be6 100644
--- a/tempest/api/compute/admin/test_availability_zone.py
+++ b/tempest/api/compute/admin/test_availability_zone.py
@@ -51,7 +51,7 @@
@attr(type='gate')
def test_get_availability_zone_list_with_non_admin_user(self):
- # List of availability zone with non admin user
+ # List of availability zone with non-administrator user
resp, availability_zone = \
self.non_adm_client.get_availability_zone_list()
self.assertEqual(200, resp.status)
@@ -59,7 +59,8 @@
@attr(type=['negative', 'gate'])
def test_get_availability_zone_list_detail_with_non_admin_user(self):
- # List of availability zones and available services with non admin user
+ # List of availability zones and available services with
+ # non-administrator user
self.assertRaises(
exceptions.Unauthorized,
self.non_adm_client.get_availability_zone_list_detail)
diff --git a/tempest/api/compute/flavors/test_flavors.py b/tempest/api/compute/flavors/test_flavors.py
index 51ce20c..c3ba671 100644
--- a/tempest/api/compute/flavors/test_flavors.py
+++ b/tempest/api/compute/flavors/test_flavors.py
@@ -52,7 +52,7 @@
@attr(type=['negative', 'gate'])
def test_get_non_existant_flavor(self):
- # flavor details are not returned for non existant flavors
+ # flavor details are not returned for non-existent flavors
self.assertRaises(exceptions.NotFound, self.client.get_flavor_details,
999)
@@ -150,7 +150,7 @@
@attr(type=['negative', 'gate'])
def test_get_flavor_details_for_invalid_flavor_id(self):
- # Ensure 404 returned for non-existant flavor ID
+ # Ensure 404 returned for non-existent flavor ID
self.assertRaises(exceptions.NotFound, self.client.get_flavor_details,
9999)
diff --git a/tempest/api/compute/floating_ips/test_list_floating_ips.py b/tempest/api/compute/floating_ips/test_list_floating_ips.py
index e380334..f5baa3c 100644
--- a/tempest/api/compute/floating_ips/test_list_floating_ips.py
+++ b/tempest/api/compute/floating_ips/test_list_floating_ips.py
@@ -80,12 +80,12 @@
@attr(type=['negative', 'gate'])
def test_get_nonexistant_floating_ip_details(self):
# Negative test:Should not be able to GET the details
- # of nonexistant floating IP
+ # of non-existent floating IP
floating_ip_id = []
resp, body = self.client.list_floating_ips()
for i in range(len(body)):
floating_ip_id.append(body[i]['id'])
- # Creating a nonexistant floatingIP id
+ # Creating a non-existent floatingIP id
while True:
non_exist_id = rand_name('999')
if non_exist_id not in floating_ip_id:
diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py
index 52239cd..a769744 100644
--- a/tempest/api/compute/images/test_image_metadata.py
+++ b/tempest/api/compute/images/test_image_metadata.py
@@ -120,20 +120,20 @@
@attr(type=['negative', 'gate'])
def test_update_nonexistant_image_metadata(self):
- # Negative test:An update should not happen for a nonexistant image
+ # Negative test:An update should not happen for a non-existent image
meta = {'key1': 'alt1', 'key2': 'alt2'}
self.assertRaises(exceptions.NotFound,
self.client.update_image_metadata, 999, meta)
@attr(type=['negative', 'gate'])
def test_get_nonexistant_image_metadata_item(self):
- # Negative test: Get on nonexistant image should not happen
+ # Negative test: Get on non-existent image should not happen
self.assertRaises(exceptions.NotFound,
self.client.get_image_metadata_item, 999, 'key2')
@attr(type=['negative', 'gate'])
def test_set_nonexistant_image_metadata(self):
- # Negative test: Metadata should not be set to a nonexistant image
+ # Negative test: Metadata should not be set to a non-existent image
meta = {'key1': 'alt1', 'key2': 'alt2'}
self.assertRaises(exceptions.NotFound, self.client.set_image_metadata,
999, meta)
@@ -149,8 +149,8 @@
@attr(type=['negative', 'gate'])
def test_delete_nonexistant_image_metadata_item(self):
- # Negative test: Shouldnt be able to delete metadata
- # item from nonexistant image
+ # Negative test: Shouldn't be able to delete metadata
+ # item from non-existent image
self.assertRaises(exceptions.NotFound,
self.client.delete_image_metadata_item, 999, 'key1')
diff --git a/tempest/api/compute/images/test_list_image_filters.py b/tempest/api/compute/images/test_list_image_filters.py
index a80f456..e700278 100644
--- a/tempest/api/compute/images/test_list_image_filters.py
+++ b/tempest/api/compute/images/test_list_image_filters.py
@@ -230,7 +230,7 @@
@attr(type=['negative', 'gate'])
def test_get_nonexistant_image(self):
- # Negative test: GET on non existant image should fail
+ # Negative test: GET on non-existent image should fail
self.assertRaises(exceptions.NotFound, self.client.get_image, 999)
diff --git a/tempest/api/compute/keypairs/test_keypairs.py b/tempest/api/compute/keypairs/test_keypairs.py
index 083fbd7..78c547a 100644
--- a/tempest/api/compute/keypairs/test_keypairs.py
+++ b/tempest/api/compute/keypairs/test_keypairs.py
@@ -157,7 +157,7 @@
k_name = rand_name('keypair-')
resp, _ = self.client.create_keypair(k_name)
self.assertEqual(200, resp.status)
- # Now try the same keyname to ceate another key
+ # Now try the same keyname to create another key
self.assertRaises(exceptions.Duplicate, self.client.create_keypair,
k_name)
resp, _ = self.client.delete_keypair(k_name)
diff --git a/tempest/api/compute/security_groups/test_security_group_rules.py b/tempest/api/compute/security_groups/test_security_group_rules.py
index 472b8b4..6071e54 100644
--- a/tempest/api/compute/security_groups/test_security_group_rules.py
+++ b/tempest/api/compute/security_groups/test_security_group_rules.py
@@ -35,7 +35,7 @@
@attr(type='gate')
def test_security_group_rules_create(self):
# Positive test: Creation of Security Group rule
- # should be successfull
+ # should be successful
# Creating a Security Group to add rules to it
s_name = rand_name('securitygroup-')
s_description = rand_name('description-')
@@ -59,7 +59,7 @@
def test_security_group_rules_create_with_optional_arguments(self):
# Positive test: Creation of Security Group rule
# with optional arguments
- # should be successfull
+ # should be successful
secgroup1 = None
secgroup2 = None
diff --git a/tempest/api/compute/security_groups/test_security_groups.py b/tempest/api/compute/security_groups/test_security_groups.py
index 30db206..3e459a2 100644
--- a/tempest/api/compute/security_groups/test_security_groups.py
+++ b/tempest/api/compute/security_groups/test_security_groups.py
@@ -112,12 +112,12 @@
@attr(type=['negative', 'gate'])
def test_security_group_get_nonexistant_group(self):
# Negative test:Should not be able to GET the details
- # of nonexistant Security Group
+ # of non-existent Security Group
security_group_id = []
resp, body = self.client.list_security_groups()
for i in range(len(body)):
security_group_id.append(body[i]['id'])
- # Creating a nonexistant Security Group id
+ # Creating a non-existent Security Group id
while True:
non_exist_id = rand_name('999')
if non_exist_id not in security_group_id:
@@ -201,12 +201,12 @@
"Skipped until the Bug #1182384 is resolved")
@attr(type=['negative', 'gate'])
def test_delete_nonexistant_security_group(self):
- # Negative test:Deletion of a nonexistant Security Group should Fail
+ # Negative test:Deletion of a non-existent Security Group should Fail
security_group_id = []
resp, body = self.client.list_security_groups()
for i in range(len(body)):
security_group_id.append(body[i]['id'])
- # Creating Non Existant Security Group
+ # Creating non-existent Security Group
while True:
non_exist_id = rand_name('999')
if non_exist_id not in security_group_id:
diff --git a/tempest/api/compute/servers/test_server_metadata.py b/tempest/api/compute/servers/test_server_metadata.py
index 45de0d6..9997b97 100644
--- a/tempest/api/compute/servers/test_server_metadata.py
+++ b/tempest/api/compute/servers/test_server_metadata.py
@@ -115,7 +115,7 @@
@attr(type='gate')
def test_get_server_metadata_item(self):
- # The value for a specic metadata key should be returned
+ # The value for a specific metadata key should be returned
resp, meta = self.client.get_server_metadata_item(self.server_id,
'key2')
self.assertTrue('value2', meta['key2'])
@@ -148,13 +148,13 @@
@attr(type=['negative', 'gate'])
def test_get_nonexistant_server_metadata_item(self):
- # Negative test: GET on nonexistant server should not succeed
+ # Negative test: GET on a non-existent server should not succeed
self.assertRaises(exceptions.NotFound,
self.client.get_server_metadata_item, 999, 'test2')
@attr(type=['negative', 'gate'])
def test_list_nonexistant_server_metadata(self):
- # Negative test:List metadata on a non existant server should
+ # Negative test:List metadata on a non-existent server should
# not succeed
self.assertRaises(exceptions.NotFound,
self.client.list_server_metadata, 999)
@@ -171,7 +171,7 @@
@attr(type=['negative', 'gate'])
def test_set_nonexistant_server_metadata(self):
- # Negative test: Set metadata on a non existant server should not
+ # Negative test: Set metadata on a non-existent server should not
# succeed
meta = {'meta1': 'data1'}
self.assertRaises(exceptions.NotFound,
@@ -179,7 +179,7 @@
@attr(type=['negative', 'gate'])
def test_update_nonexistant_server_metadata(self):
- # Negative test: An update should not happen for a nonexistant image
+ # Negative test: An update should not happen for a non-existent image
meta = {'key1': 'value1', 'key2': 'value2'}
self.assertRaises(exceptions.NotFound,
self.client.update_server_metadata, 999, meta)
@@ -195,7 +195,7 @@
@attr(type=['negative', 'gate'])
def test_delete_nonexistant_server_metadata_item(self):
# Negative test: Should not be able to delete metadata item from a
- # nonexistant server
+ # non-existent server
# Delete the metadata item
self.assertRaises(exceptions.NotFound,
diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py
index e09a23f..226c40e 100644
--- a/tempest/api/compute/servers/test_servers_negative.py
+++ b/tempest/api/compute/servers/test_servers_negative.py
@@ -154,7 +154,7 @@
@attr(type=['negative', 'gate'])
def test_create_with_non_existant_keypair(self):
- # Pass a non existant keypair while creating a server
+ # Pass a non-existent keypair while creating a server
key_name = rand_name('key')
self.assertRaises(exceptions.BadRequest,
diff --git a/tempest/api/identity/admin/test_roles.py b/tempest/api/identity/admin/test_roles.py
index cc112cc..ac145c6 100644
--- a/tempest/api/identity/admin/test_roles.py
+++ b/tempest/api/identity/admin/test_roles.py
@@ -56,7 +56,7 @@
@attr(type='gate')
def test_list_roles_by_unauthorized_user(self):
- # Non admin user should not be able to list roles
+ # Non-administrator user should not be able to list roles
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.list_roles)
@@ -116,7 +116,8 @@
@attr(type='gate')
def test_assign_user_role_by_unauthorized_user(self):
- # Non admin user should not be authorized to assign a role to user
+ # Non-administrator user should not be authorized to
+ # assign a role to user
(user, tenant, role) = self._get_role_params()
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.assign_user_role,
@@ -174,7 +175,8 @@
@attr(type='gate')
def test_remove_user_role_by_unauthorized_user(self):
- # Non admin user should not be authorized to remove a user's role
+ # Non-administrator user should not be authorized to
+ # remove a user's role
(user, tenant, role) = self._get_role_params()
resp, user_role = self.client.assign_user_role(tenant['id'],
user['id'],
@@ -237,7 +239,8 @@
@attr(type='gate')
def test_list_user_roles_by_unauthorized_user(self):
- # Non admin user should not be authorized to list a user's roles
+ # Non-administrator user should not be authorized to list
+ # a user's roles
(user, tenant, role) = self._get_role_params()
self.client.assign_user_role(tenant['id'], user['id'], role['id'])
self.assertRaises(exceptions.Unauthorized,
diff --git a/tempest/api/identity/admin/test_tenants.py b/tempest/api/identity/admin/test_tenants.py
index e8625db..a61a115 100644
--- a/tempest/api/identity/admin/test_tenants.py
+++ b/tempest/api/identity/admin/test_tenants.py
@@ -26,7 +26,7 @@
@attr(type='gate')
def test_list_tenants_by_unauthorized_user(self):
- # Non-admin user should not be able to list tenants
+ # Non-administrator user should not be able to list tenants
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.list_tenants)
@@ -63,7 +63,7 @@
@attr(type='gate')
def test_tenant_delete_by_unauthorized_user(self):
- # Non-admin user should not be able to delete a tenant
+ # Non-administrator user should not be able to delete a tenant
tenant_name = rand_name('tenant-')
resp, tenant = self.client.create_tenant(tenant_name)
self.data.tenants.append(tenant)
@@ -164,7 +164,7 @@
@attr(type='gate')
def test_create_tenant_by_unauthorized_user(self):
- # Non-admin user should not be authorized to create a tenant
+ # Non-administrator user should not be authorized to create a tenant
tenant_name = rand_name('tenant-')
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.create_tenant, tenant_name)
diff --git a/tempest/api/identity/admin/test_users.py b/tempest/api/identity/admin/test_users.py
index 4cfeb45..3455b5d 100644
--- a/tempest/api/identity/admin/test_users.py
+++ b/tempest/api/identity/admin/test_users.py
@@ -48,7 +48,7 @@
@attr(type=['negative', 'gate'])
def test_create_user_by_unauthorized_user(self):
- # Non-admin should not be authorized to create a user
+ # Non-administrator should not be authorized to create a user
self.data.setup_test_tenant()
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.create_user, self.alt_user,
@@ -115,7 +115,7 @@
@attr(type=['negative', 'gate'])
def test_delete_users_by_unauthorized_user(self):
- # Non admin user should not be authorized to delete a user
+ # Non-administrator user should not be authorized to delete a user
self.data.setup_test_user()
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.delete_user,
@@ -213,7 +213,7 @@
@attr(type=['negative', 'gate'])
def test_get_users_by_unauthorized_user(self):
- # Non admin user should not be authorized to get user list
+ # Non-administrator user should not be authorized to get user list
self.data.setup_test_user()
self.assertRaises(exceptions.Unauthorized,
self.non_admin_client.get_users)
@@ -301,7 +301,7 @@
@attr(type=['negative', 'gate'])
def test_list_users_with_invalid_tenant(self):
# Should not be able to return a list of all
- # users for a nonexistant tenant
+ # users for a non-existent tenant
# Assign invalid tenant ids
invalid_id = list()
invalid_id.append(rand_name('999'))
diff --git a/tempest/api/identity/admin/v3/test_domains.py b/tempest/api/identity/admin/v3/test_domains.py
index 9136934..2fbef77 100644
--- a/tempest/api/identity/admin/v3/test_domains.py
+++ b/tempest/api/identity/admin/v3/test_domains.py
@@ -25,7 +25,7 @@
_interface = 'json'
def _delete_domain(self, domain_id):
- # It is necessary to disable the domian before deleting,
+ # It is necessary to disable the domain before deleting,
# or else it would result in unauthorized error
_, body = self.v3_client.update_domain(domain_id, enabled=False)
resp, _ = self.v3_client.delete_domain(domain_id)
@@ -39,7 +39,7 @@
for _ in range(3):
_, domain = self.v3_client.create_domain(
rand_name('domain-'), description=rand_name('domain-desc-'))
- # Delete the domian at the end of this method
+ # Delete the domain at the end of this method
self.addCleanup(self._delete_domain, domain['id'])
domain_ids.append(domain['id'])
# List and Verify Domains
diff --git a/tempest/api/identity/admin/v3/test_endpoints.py b/tempest/api/identity/admin/v3/test_endpoints.py
index 9d143ed..02a6f5b 100644
--- a/tempest/api/identity/admin/v3/test_endpoints.py
+++ b/tempest/api/identity/admin/v3/test_endpoints.py
@@ -59,7 +59,7 @@
def test_list_endpoints(self):
# Get a list of endpoints
resp, fetched_endpoints = self.client.list_endpoints()
- # Asserting LIST Endpoint
+ # Asserting LIST endpoints
self.assertEqual(resp['status'], '200')
missing_endpoints =\
[e for e in self.setup_endpoints if e not in fetched_endpoints]
diff --git a/tempest/api/identity/admin/v3/test_roles.py b/tempest/api/identity/admin/v3/test_roles.py
index 980323a..a238c46 100644
--- a/tempest/api/identity/admin/v3/test_roles.py
+++ b/tempest/api/identity/admin/v3/test_roles.py
@@ -54,7 +54,7 @@
resp[1], _ = cls.v3_client.delete_group(cls.group_body['id'])
resp[2], _ = cls.v3_client.delete_user(cls.user_body['id'])
resp[3], _ = cls.v3_client.delete_project(cls.project['id'])
- # NOTE(harika-vakadi): It is necessary to disable the domian
+ # NOTE(harika-vakadi): It is necessary to disable the domain
# before deleting,or else it would result in unauthorized error
cls.v3_client.update_domain(cls.domain['id'], enabled=False)
resp[4], _ = cls.v3_client.delete_domain(cls.domain['id'])
diff --git a/tempest/api/network/test_routers.py b/tempest/api/network/test_routers.py
index 9f8c742..8b939fe 100644
--- a/tempest/api/network/test_routers.py
+++ b/tempest/api/network/test_routers.py
@@ -97,7 +97,7 @@
name = rand_name('router-')
resp, create_body = self.client.create_router(name)
self.addCleanup(self.client.delete_router, create_body['router']['id'])
- # Add router interafce with subnet id
+ # Add router interface with subnet id
resp, interface = self.client.add_router_interface_with_subnet_id(
create_body['router']['id'], subnet['id'])
self.assertEqual('200', resp['status'])
diff --git a/tempest/api/network/test_security_groups.py b/tempest/api/network/test_security_groups.py
index 24f8286..60ca88a 100644
--- a/tempest/api/network/test_security_groups.py
+++ b/tempest/api/network/test_security_groups.py
@@ -31,7 +31,7 @@
def _delete_security_group(self, secgroup_id):
resp, _ = self.client.delete_security_group(secgroup_id)
self.assertEqual(204, resp.status)
- # Asserting that the secgroup is not found in the list
+ # Asserting that the security group is not found in the list
# after deletion
resp, list_body = self.client.list_security_groups()
self.assertEqual('200', resp['status'])
@@ -43,7 +43,7 @@
def _delete_security_group_rule(self, rule_id):
resp, _ = self.client.delete_security_group_rule(rule_id)
self.assertEqual(204, resp.status)
- # Asserting that the secgroup is not found in the list
+ # Asserting that the security group is not found in the list
# after deletion
resp, list_body = self.client.list_security_group_rules()
self.assertEqual('200', resp['status'])
@@ -88,7 +88,7 @@
for secgroup in list_body['security_groups']:
secgroup_list.append(secgroup['id'])
self.assertIn(group_create_body['security_group']['id'], secgroup_list)
- # No Udpate in security group
+ # No Update in security group
# Create rule
resp, rule_create_body = self.client.create_security_group_rule(
group_create_body['security_group']['id']
diff --git a/tempest/api/orchestration/stacks/test_neutron_resources.py b/tempest/api/orchestration/stacks/test_neutron_resources.py
index c934020..174c82a 100644
--- a/tempest/api/orchestration/stacks/test_neutron_resources.py
+++ b/tempest/api/orchestration/stacks/test_neutron_resources.py
@@ -147,7 +147,7 @@
@attr(type='slow')
def test_created_network(self):
- """Verifies created netowrk."""
+ """Verifies created network."""
network_id = self.test_resources.get('Network')['physical_resource_id']
resp, body = self.network_client.show_network(network_id)
self.assertEqual('200', resp['status'])
diff --git a/tempest/api/orchestration/stacks/test_server_cfn_init.py b/tempest/api/orchestration/stacks/test_server_cfn_init.py
index ffe8def..41849d0 100644
--- a/tempest/api/orchestration/stacks/test_server_cfn_init.py
+++ b/tempest/api/orchestration/stacks/test_server_cfn_init.py
@@ -158,7 +158,7 @@
resp, body = self.client.get_resource(sid, rid)
self.assertEqual('CREATE_COMPLETE', body['resource_status'])
- # fetch the ip address from servers client, since we can't get it
+ # fetch the IP address from servers client, since we can't get it
# from the stack until stack create is complete
resp, server = self.servers_client.get_server(
body['physical_resource_id'])
diff --git a/tempest/api/volume/test_volumes_list.py b/tempest/api/volume/test_volumes_list.py
index 8c39e08..d06a26f 100644
--- a/tempest/api/volume/test_volumes_list.py
+++ b/tempest/api/volume/test_volumes_list.py
@@ -27,7 +27,7 @@
ensure that the backing file for the volume group that Nova uses
has space for at least 3 1G volumes!
If you are running a Devstack environment, ensure that the
- VOLUME_BACKING_FILE_SIZE is atleast 4G in your localrc
+ VOLUME_BACKING_FILE_SIZE is at least 4G in your localrc
"""
_interface = 'json'
diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py
index e2b15a4..014ab32 100644
--- a/tempest/api/volume/test_volumes_negative.py
+++ b/tempest/api/volume/test_volumes_negative.py
@@ -31,8 +31,8 @@
@attr(type='gate')
def test_volume_get_nonexistant_volume_id(self):
- # Should not be able to get a nonexistant volume
- # Creating a nonexistant volume id
+ # Should not be able to get a non-existent volume
+ # Creating a non-existent volume id
volume_id_list = []
resp, volumes = self.client.list_volumes()
for i in range(len(volumes)):
@@ -41,14 +41,14 @@
non_exist_id = rand_name('999')
if non_exist_id not in volume_id_list:
break
- # Trying to Get a non existant volume
+ # Trying to Get a non-existent volume
self.assertRaises(exceptions.NotFound, self.client.get_volume,
non_exist_id)
@attr(type='gate')
def test_volume_delete_nonexistant_volume_id(self):
- # Should not be able to delete a nonexistant Volume
- # Creating nonexistant volume id
+ # Should not be able to delete a non-existent Volume
+ # Creating non-existent volume id
volume_id_list = []
resp, volumes = self.client.list_volumes()
for i in range(len(volumes)):
@@ -57,7 +57,7 @@
non_exist_id = '12345678-abcd-4321-abcd-123456789098'
if non_exist_id not in volume_id_list:
break
- # Try to Delete a non existant volume
+ # Try to delete a non-existent volume
self.assertRaises(exceptions.NotFound, self.client.delete_volume,
non_exist_id)