From c3a095b9285d1602eb777f183e94065d50de3660 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Sat, 17 Aug 2013 09:15:44 +0200 Subject: [PATCH] Fixing the rest of the comment spacing issues The comments which are there to be uncommented are preserved, in the doc/source/conf.py and in tempest.conf.sample. (Creating a validator in progress.) Change-Id: I381a18898d38d60d5755850fe0a09bc301e331f7 --- etc/tempest.conf.sample | 16 ++++++++-------- tempest/api/identity/admin/v3/test_roles.py | 2 +- tempest/cli/__init__.py | 2 +- tempest/cli/simple_read_only/test_compute.py | 2 +- .../cli/simple_read_only/test_compute_manage.py | 2 +- tempest/common/rest_client.py | 8 ++++---- tempest/common/utils/linux/remote_client.py | 2 +- tempest/scenario/manager.py | 2 +- tempest/scenario/test_network_basic_ops.py | 6 +++--- tempest/whitebox/manager.py | 4 ++-- tempest/whitebox/test_servers_whitebox.py | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample index f1aaa07db1..2d7f754faa 100644 --- a/etc/tempest.conf.sample +++ b/etc/tempest.conf.sample @@ -1,5 +1,5 @@ [DEFAULT] -# log_config = /opt/stack/tempest/etc/logging.conf.sample +#log_config = /opt/stack/tempest/etc/logging.conf.sample # disable logging to the stderr use_stderr = False @@ -285,7 +285,7 @@ s3_url = http://localhost:3333 aws_access = aws_secret = -#Image materials for S3 upload +# Image materials for S3 upload # ALL content of the specified directory will be uploaded to S3 s3_materials_path = /opt/stack/devstack/files/images/s3-materials/cirros-0.3.1 @@ -293,22 +293,22 @@ s3_materials_path = /opt/stack/devstack/files/images/s3-materials/cirros-0.3.1 # Subdirectories not allowed! # The filenames will be used as a Keys in the S3 Buckets -#ARI Ramdisk manifest. Must be in the above s3_materials_path +# ARI Ramdisk manifest. Must be in the above s3_materials_path ari_manifest = cirros-0.3.1-x86_64-initrd.manifest.xml -#AMI Machine Image manifest. Must be in the above s3_materials_path +# AMI Machine Image manifest. Must be in the above s3_materials_path ami_manifest = cirros-0.3.1-x86_64-blank.img.manifest.xml -#AKI Kernel Image manifest, Must be in the above s3_materials_path +# AKI Kernel Image manifest, Must be in the above s3_materials_path aki_manifest = cirros-0.3.1-x86_64-vmlinuz.manifest.xml -#Instance type +# Instance type instance_type = m1.tiny -#TCP/IP connection timeout +# TCP/IP connection timeout http_socket_timeout = 5 -#Number of retries actions on connection or 5xx error +# Number of retries actions on connection or 5xx error num_retries = 1 # Status change wait timout diff --git a/tempest/api/identity/admin/v3/test_roles.py b/tempest/api/identity/admin/v3/test_roles.py index cab84c06f3..980323a51b 100644 --- a/tempest/api/identity/admin/v3/test_roles.py +++ b/tempest/api/identity/admin/v3/test_roles.py @@ -54,7 +54,7 @@ class RolesV3TestJSON(base.BaseIdentityAdminTest): 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 domian # 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/cli/__init__.py b/tempest/cli/__init__.py index f04d23f38e..b34d516f86 100644 --- a/tempest/cli/__init__.py +++ b/tempest/cli/__init__.py @@ -93,7 +93,7 @@ class ClientTestBase(tempest.test.BaseTestCase): def cmd_with_auth(self, cmd, action, flags='', params='', admin=True, fail_ok=False): """Executes given command with auth attributes appended.""" - #TODO(jogo) make admin=False work + # TODO(jogo) make admin=False work creds = ('--os-username %s --os-tenant-name %s --os-password %s ' '--os-auth-url %s ' % (self.identity.admin_username, self.identity.admin_tenant_name, self.identity.admin_password, diff --git a/tempest/cli/simple_read_only/test_compute.py b/tempest/cli/simple_read_only/test_compute.py index 4c7f604111..9b358e66e2 100644 --- a/tempest/cli/simple_read_only/test_compute.py +++ b/tempest/cli/simple_read_only/test_compute.py @@ -48,7 +48,7 @@ class SimpleReadOnlyNovaClientTest(tempest.cli.ClientTestBase): self.nova, 'this-does-nova-exist') - #NOTE(jogo): Commands in order listed in 'nova help' + # NOTE(jogo): Commands in order listed in 'nova help' # Positional arguments: diff --git a/tempest/cli/simple_read_only/test_compute_manage.py b/tempest/cli/simple_read_only/test_compute_manage.py index 184882751b..523c65f6a2 100644 --- a/tempest/cli/simple_read_only/test_compute_manage.py +++ b/tempest/cli/simple_read_only/test_compute_manage.py @@ -41,7 +41,7 @@ class SimpleReadOnlyNovaManageTest(tempest.cli.ClientTestBase): self.nova_manage, 'this-does-nova-exist') - #NOTE(jogo): Commands in order listed in 'nova-manage -h' + # NOTE(jogo): Commands in order listed in 'nova-manage -h' # test flags def test_help_flag(self): diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py index 759ab81a67..ea5b4f4c3f 100644 --- a/tempest/common/rest_client.py +++ b/tempest/common/rest_client.py @@ -323,7 +323,7 @@ class RestClient(object): if (resp.status in set((204, 205, 304)) or resp.status < 200 or method.upper() == 'HEAD') and resp_body: raise exceptions.ResponseWithNonEmptyBody(status=resp.status) - #NOTE(afazekas): + # NOTE(afazekas): # If the HTTP Status Code is 205 # 'The response MUST NOT include an entity.' # A HTTP entity has an entity-body and an 'entity-header'. @@ -336,7 +336,7 @@ class RestClient(object): 0 != len(set(resp.keys()) - set(('status',)) - self.response_header_lc - self.general_header_lc)): raise exceptions.ResponseWithEntity() - #NOTE(afazekas) + # NOTE(afazekas) # Now the swift sometimes (delete not empty container) # returns with non json error response, we can create new rest class # for swift. @@ -458,8 +458,8 @@ class RestClient(object): message = resp_body if parse_resp: resp_body = self._parse_resp(resp_body) - #I'm seeing both computeFault and cloudServersFault come back. - #Will file a bug to fix, but leave as is for now. + # I'm seeing both computeFault and cloudServersFault come back. + # Will file a bug to fix, but leave as is for now. if 'cloudServersFault' in resp_body: message = resp_body['cloudServersFault']['message'] elif 'computeFault' in resp_body: diff --git a/tempest/common/utils/linux/remote_client.py b/tempest/common/utils/linux/remote_client.py index de2bf43931..2cbb74ddbd 100644 --- a/tempest/common/utils/linux/remote_client.py +++ b/tempest/common/utils/linux/remote_client.py @@ -24,7 +24,7 @@ from tempest.exceptions import SSHTimeout class RemoteClient(): - #Note(afazekas): It should always get an address instead of server + # NOTE(afazekas): It should always get an address instead of server def __init__(self, server, username, password=None, pkey=None): ssh_timeout = TempestConfig().compute.ssh_timeout network = TempestConfig().compute.network_for_ssh diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index d0f0127e60..c551e70e3d 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -268,7 +268,7 @@ class NetworkScenarioTest(OfficialClientTest): def check_preconditions(cls): if (cls.config.service_available.neutron): cls.enabled = True - #verify that neutron_available is telling the truth + # verify that neutron_available is telling the truth try: cls.network_client.list_networks() except exc.EndpointNotFound: diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 5311eaeab3..c0317772ce 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -43,7 +43,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): ssh server hosted at the IP address. This check guarantees that the IP address is associated with the target VM. - #TODO(mnewby) - Need to implement the following: + # TODO(mnewby) - Need to implement the following: - the Tempest host can ssh into the VM via the IP address and successfully execute the following: @@ -182,8 +182,8 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): @attr(type='smoke') def test_004_check_networks(self): - #Checks that we see the newly created network/subnet/router via - #checking the result of list_[networks,routers,subnets] + # Checks that we see the newly created network/subnet/router via + # checking the result of list_[networks,routers,subnets] seen_nets = self._list_networks() seen_names = [n['name'] for n in seen_nets] seen_ids = [n['id'] for n in seen_nets] diff --git a/tempest/whitebox/manager.py b/tempest/whitebox/manager.py index b2632f1b3b..3b1b10719f 100644 --- a/tempest/whitebox/manager.py +++ b/tempest/whitebox/manager.py @@ -72,7 +72,7 @@ class ComputeWhiteboxTest(manager.OfficialClientTest): cls.flavor_ref = cls.config.compute.flavor_ref cls.flavor_ref_alt = cls.config.compute.flavor_ref_alt - #NOTE(afazekas): Mimics the helper method used in the api tests + # NOTE(afazekas): Mimics the helper method used in the api tests @classmethod def create_server(cls, **kwargs): flavor_ref = cls.config.compute.flavor_ref @@ -127,7 +127,7 @@ class ComputeWhiteboxTest(manager.OfficialClientTest): cmd = shlex.split(cmd) result = subprocess.Popen(cmd, stdout=subprocess.PIPE) - #Todo(rohitk): Need to define host connection parameters in config + # TODO(rohitk): Need to define host connection parameters in config else: client = self.get_ssh_connection(self.config.whitebox.api_host, self.config.whitebox.api_user, diff --git a/tempest/whitebox/test_servers_whitebox.py b/tempest/whitebox/test_servers_whitebox.py index 1c1cdebd8b..abe903ca11 100644 --- a/tempest/whitebox/test_servers_whitebox.py +++ b/tempest/whitebox/test_servers_whitebox.py @@ -26,7 +26,7 @@ class ServersWhiteboxTest(manager.ComputeWhiteboxTest): @classmethod def setUpClass(cls): super(ServersWhiteboxTest, cls).setUpClass() - #NOTE(afazekas): Strange relationship + # NOTE(afazekas): Strange relationship BaseIdentityAdminTest.setUpClass() cls.client = cls.servers_client cls.img_client = cls.images_client