Fixed specific, common typos in Compute test code - first pass

Fixed several occurences of common typos in the Compute test code
- Replaced 'with  with' with 'with'
- Replaced 'the a' with appropriate word
- Corrected capitalization for all references to 'OpenStack'
  with the exception of references pointing to a specific object,
  directory or file
- Corrected spelling of 'necessary'

Change-Id: I7ac3ae9786b3ae70ce80c50f4fbf89804027e802
This commit is contained in:
Anna Eilering 2015-04-02 13:48:44 -05:00
parent 981496d2d8
commit 07a8a4616c
22 changed files with 42 additions and 42 deletions

View File

@ -25,7 +25,7 @@ class CreateFlavorTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A public flavor with a name starting with 'flavor', 64MB of RAM,

View File

@ -25,7 +25,7 @@ class DeleteFlavorTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A public flavor with a name starting with 'flavor', 64MB of RAM,

View File

@ -25,7 +25,7 @@ class PrivateFlavorTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A private flavor with a name starting with 'flavor', 64MB of RAM,
@ -104,7 +104,7 @@ class PrivateFlavorNegativeTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A private flavor with a name starting with 'flavor', 64MB of RAM,

View File

@ -32,7 +32,7 @@ class HostActionsAdminTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following data is generated during this setup:
- A list of hosts

View File

@ -28,7 +28,7 @@ class HostsAdminTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following data is generated during this setup:
- A list of hosts

View File

@ -61,7 +61,7 @@ class LiveMigratateServerWithVolumeTests(LiveMigratationServerTests):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are accessed from a parent class:
- An instance from LiveMigratationServerTests

View File

@ -25,7 +25,7 @@ class QuotasAdminTest(ComputeAdminFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- An instance is created using the tenant identified in
@ -107,7 +107,7 @@ class QuotasAdminTest(ComputeAdminFixture):
- The quota value for instances is equal to 20
- After the admin deletes the quota values for the tenant identified
during setup the quoate values are populated
- The quota value for instances is equal to the the configured
- The quota value for instances is equal to the configured
default value
"""
self.admin_quotas_client.update_quota(

View File

@ -39,7 +39,7 @@ class ConfigDriveTest(ComputeFixture):
The following resources are created during this set up:
- A keypair with a random name starting with 'key'
- A server with with the following settings:
- A server with the following settings:
- config_drive set to True
- The keypair previously created
- Files to be injected at server creation including the

View File

@ -40,7 +40,7 @@ class ConfigDriveDirectoryTest(ComputeFixture):
The following resources are created during this set up:
- A keypair with a random name starting with 'key'
- A server with with the following settings:
- A server with the following settings:
- config_drive set to True
- The keypair previously created
- Files to be injected at server creation including the
@ -71,7 +71,7 @@ class ConfigDriveDirectoryTest(ComputeFixture):
@tags(type='smoke', net='yes')
def test_create_server_config_drive_openstack_directory(self):
"""
A server with config drive enabled should have openstack directories
A server with config drive enabled should have 'openstack' directories
Get a remote instance client for the server created during test set up.
Mount the config drive on the server. Use the remote client to validate
@ -94,12 +94,12 @@ class ConfigDriveDirectoryTest(ComputeFixture):
directory_path='{0}/openstack/latest'.format(
self.config_drive_config.base_path_to_mount))
self.assertTrue(dir_openstack_present,
msg="Directory Openstack is present")
msg="Directory openstack is present")
dir_openstack_content_present = remote_client.is_directory_present(
directory_path='{0}/openstack/content'.format(
self.config_drive_config.base_path_to_mount))
self.assertTrue(dir_openstack_content_present,
msg="Directory Openstack is present")
msg="Directory openstack is present")
@tags(type='smoke', net='yes')
def test_create_server_config_drive_ec2_directory(self):
@ -125,7 +125,7 @@ class ConfigDriveDirectoryTest(ComputeFixture):
directory_path='{0}/ec2/latest'.format(
self.config_drive_config.base_path_to_mount))
self.assertTrue(dir_openstack_present,
msg="Directory Openstack is present")
msg="Directory openstack is present")
@tags(type='smoke', net='yes')
def test_create_server_config_drive_user_data_not_present(self):

View File

@ -38,7 +38,7 @@ class ConfigDriveFilesTest(ComputeFixture):
The following resources are created during this set up:
- A keypair with a random name starting with 'key'
- A server with with the following settings:
- A server with the following settings:
- config_drive set to True
- The keypair previously created
- Files to be injected at server creation including the
@ -70,29 +70,29 @@ class ConfigDriveFilesTest(ComputeFixture):
@tags(type='smoke', net='yes')
def test_config_drive_openstack_metadata(self):
"""
Verify openstack metadata on config drive
Verify OpenStack metadata on config drive
Mount the config drive on the server. Get the Openstack metadata on the
server and validate that the values of the openstack metadata match the
Mount the config drive on the server. Get the OpenStack metadata on the
server and validate that the values of the OpenStack metadata match the
expected values.
The following assertions occur:
- The server's admin password is equal to the admin password in the
openstack metadata
- The availability_zone value in the openstack metadata is not None
- The path of the first file in the openstack metadata files is
OpenStack metadata
- The availability_zone value in the OpenStack metadata is not None
- The path of the first file in the OpenStack metadata files is
equal to the file path set during test set up.
- The hostname value in the openstack metadata is not None
- The launch_index value in the openstack metadata is not None
- The name in the openstack metadata is equal to the name of the
- The hostname value in the OpenStack metadata is not None
- The launch_index value in the OpenStack metadata is not None
- The name in the OpenStack metadata is equal to the name of the
server created during test set up
- The value of 'meta_key_1' in the openstack metadata is equal to
- The value of 'meta_key_1' in the OpenStack metadata is equal to
'meta_value_1'
- The value of 'meta_key_2' in the openstack metadata is equal to
- The value of 'meta_key_2' in the OpenStack metadata is equal to
'meta_value_2'
- The public key in the openstack metadata is equal to the public
- The public key in the OpenStack metadata is equal to the public
key created during test set up.
- The uuid in the openstack metadata is equal to the id of the
- The uuid in the OpenStack metadata is equal to the id of the
server created during test set up
"""
message = "Expected {0} to be {1}, was {2}."

View File

@ -30,7 +30,7 @@ class ConfigDriveFilesTest(ComputeFixture):
The following resources are created during this set up:
- A keypair with a random name starting with 'key'
- A server with with the following settings:
- A server with the following settings:
- config_drive set to True
- The keypair previously created
- Remaining values required for creating a server will come

View File

@ -90,7 +90,7 @@ class RebootServerHardTests(ComputeFixture):
# verify that the directory exists after the reboot and remount
self.assertTrue(
self.dir_openstack_content_present,
msg="Directory Openstack is not present")
msg="Directory openstack is not present")
def test_hard_reboot_openstack_metadata(self):

View File

@ -90,7 +90,7 @@ class RebootServerSoftTests(ComputeFixture):
# verify that the directory exists after the reboot and remount
self.assertTrue(
self.dir_openstack_content_present,
msg="Directory Openstack is not present")
msg="Directory openstack is not present")
def test_soft_reboot_openstack_metadata(self):

View File

@ -113,7 +113,7 @@ class ConfigDriveRebuildTest(ComputeFixture):
def test_directory_present_after_rebuild(self):
self.assertEqual(self.dir_openstack_content_present, True,
msg="Directory Openstack is not present")
msg="Directory openstack is not present")
def test_openstack_metadata(self):
self.assertIsNotNone(

View File

@ -114,7 +114,7 @@ class ConfigDriveRescueTests(ComputeFixture):
def test_directory_present_after_rescue(self):
# verify that the directory exists after the reboot and remount
self.assertTrue(self.dir_openstack_content_present,
msg="Directory Openstack is not present")
msg="Directory openstack is not present")
def test_openstack_metadata(self):
message = "Expected {0} to be {1}, was {2}."

View File

@ -24,7 +24,7 @@ class FlavorsTest(ComputeFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- a list of flavors

View File

@ -24,7 +24,7 @@ class DeleteServerAsAdminTests(ComputeAdminFixture,
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing.
Perform actions that setup the necessary resources for testing.
The following resources are created during this setup:
- Create a server from server behaviors.

View File

@ -209,7 +209,7 @@ class ServerFromImageCreateImageTests(ServerFromImageFixture,
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following data is generated during this setup:
- A dictionary of metadata with the values:

View File

@ -203,7 +203,7 @@ class CreateServerTest(object):
from test configuration, If the flavors ephemeral disk(s) size is 0, the
test will return and end. If the flavor's ephemeral disk(s) size is not
0, get a remote client for the server created during test set up. Use
the remote client to get the a list of all disks on the server. Remove
the remote client to get a list of all disks on the server. Remove
the primary disk from the list of disks. Verify that the remaining disks
in the disk list are equal in size to the ephemeral disk size of the
flavor from test configuration. Format each disk in the list of disks
@ -472,7 +472,7 @@ class ServerFromImageCreateServerTests(ServerFromImageFixture,
The following resources are created during this setup:
- A keypair with a random name starting with 'key'
- A server with with the following settings:
- A server with the following settings:
- The name value previously generated
- The keypair previously created
- if injected files are enabled, files to be injected at server

View File

@ -215,7 +215,7 @@ class ServerFromImageDeleteServerTests(ServerFromImageFixture,
@classmethod
def setUpClass(cls):
"""
Perform actions that set up the neccesary resources for testing
Perform actions that set up the necessary resources for testing
The following resources are created during this set up:
- A server with values from the test configuration

View File

@ -62,7 +62,7 @@ class ServerFromImageRebootServerHardTests(ServerFromImageFixture,
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A keypair with a random name starting with 'key'

View File

@ -62,7 +62,7 @@ class ServerFromImageRebootServerSoftTests(ServerFromImageFixture,
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the neccesary resources for testing
Perform actions that setup the necessary resources for testing
The following resources are created during this setup:
- A keypair with a random name starting with 'key'