Fix typos in scenario tests, etc.
a instance => an instance paramater => parameter suported => supported Openstack => OpenStack Change-Id: Ib6842634161f233986665424e76d9067cb1520d6
This commit is contained in:
parent
35a3a25226
commit
6d5a2b44b1
@ -371,7 +371,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
|
|||||||
# for a given server_id and number of lines
|
# for a given server_id and number of lines
|
||||||
|
|
||||||
# This reboot is necessary for outputting some console log after
|
# This reboot is necessary for outputting some console log after
|
||||||
# creating a instance backup. If a instance backup, the console
|
# creating an instance backup. If an instance backup, the console
|
||||||
# log file is truncated and we cannot get any console log through
|
# log file is truncated and we cannot get any console log through
|
||||||
# "console-log" API.
|
# "console-log" API.
|
||||||
# The detail is https://bugs.launchpad.net/nova/+bug/1251920
|
# The detail is https://bugs.launchpad.net/nova/+bug/1251920
|
||||||
|
@ -27,7 +27,7 @@ class DatabaseLimitsTest(base.BaseDatabaseTest):
|
|||||||
@test.attr(type='smoke')
|
@test.attr(type='smoke')
|
||||||
@test.idempotent_id('73024538-f316-4829-b3e9-b459290e137a')
|
@test.idempotent_id('73024538-f316-4829-b3e9-b459290e137a')
|
||||||
def test_absolute_limits(self):
|
def test_absolute_limits(self):
|
||||||
# Test to verify if all absolute limit paramaters are
|
# Test to verify if all absolute limit parameters are
|
||||||
# present when verb is ABSOLUTE
|
# present when verb is ABSOLUTE
|
||||||
limits = self.client.list_db_limits()['limits']
|
limits = self.client.list_db_limits()['limits']
|
||||||
expected_abs_limits = ['max_backups', 'max_volumes',
|
expected_abs_limits = ['max_backups', 'max_volumes',
|
||||||
|
@ -33,7 +33,7 @@ def create_test_server(clients, validatable=False, validation_resources=None,
|
|||||||
This method is a common wrapper returning a test server that can be
|
This method is a common wrapper returning a test server that can be
|
||||||
pingable or sshable.
|
pingable or sshable.
|
||||||
|
|
||||||
:param clients: Client manager which provides Openstack Tempest clients.
|
:param clients: Client manager which provides OpenStack Tempest clients.
|
||||||
:param validatable: Whether the server will be pingable or sshable.
|
:param validatable: Whether the server will be pingable or sshable.
|
||||||
:param validation_resources: Resources created for the connection to the
|
:param validation_resources: Resources created for the connection to the
|
||||||
server. Include a keypair, a security group and an IP.
|
server. Include a keypair, a security group and an IP.
|
||||||
|
@ -163,9 +163,9 @@ class RemoteClient(object):
|
|||||||
* dhclient
|
* dhclient
|
||||||
"""
|
"""
|
||||||
# TODO(yfried): add support for dhcpcd
|
# TODO(yfried): add support for dhcpcd
|
||||||
suported_clients = ['udhcpc', 'dhclient']
|
supported_clients = ['udhcpc', 'dhclient']
|
||||||
dhcp_client = CONF.scenario.dhcp_client
|
dhcp_client = CONF.scenario.dhcp_client
|
||||||
if dhcp_client not in suported_clients:
|
if dhcp_client not in supported_clients:
|
||||||
raise exceptions.InvalidConfiguration('%s DHCP client unsupported'
|
raise exceptions.InvalidConfiguration('%s DHCP client unsupported'
|
||||||
% dhcp_client)
|
% dhcp_client)
|
||||||
if dhcp_client == 'udhcpc' and not fixed_ip:
|
if dhcp_client == 'udhcpc' and not fixed_ip:
|
||||||
|
@ -30,7 +30,7 @@ class TestShelveInstance(manager.ScenarioTest):
|
|||||||
"""
|
"""
|
||||||
This test shelves then unshelves a Nova instance
|
This test shelves then unshelves a Nova instance
|
||||||
The following is the scenario outline:
|
The following is the scenario outline:
|
||||||
* boot a instance and create a timestamp file in it
|
* boot an instance and create a timestamp file in it
|
||||||
* shelve the instance
|
* shelve the instance
|
||||||
* unshelve the instance
|
* unshelve the instance
|
||||||
* check the existence of the timestamp file in the unshelved instance
|
* check the existence of the timestamp file in the unshelved instance
|
||||||
|
@ -29,7 +29,7 @@ class TestSnapshotPattern(manager.ScenarioTest):
|
|||||||
"""
|
"""
|
||||||
This test is for snapshotting an instance and booting with it.
|
This test is for snapshotting an instance and booting with it.
|
||||||
The following is the scenario outline:
|
The following is the scenario outline:
|
||||||
* boot a instance and create a timestamp file in it
|
* boot an instance and create a timestamp file in it
|
||||||
* snapshot the instance
|
* snapshot the instance
|
||||||
* boot a second instance from the snapshot
|
* boot a second instance from the snapshot
|
||||||
* check the existence of the timestamp file in the second instance
|
* check the existence of the timestamp file in the second instance
|
||||||
@ -62,11 +62,11 @@ class TestSnapshotPattern(manager.ScenarioTest):
|
|||||||
'Snapshotting is not available.')
|
'Snapshotting is not available.')
|
||||||
@test.services('compute', 'network', 'image')
|
@test.services('compute', 'network', 'image')
|
||||||
def test_snapshot_pattern(self):
|
def test_snapshot_pattern(self):
|
||||||
# prepare for booting a instance
|
# prepare for booting an instance
|
||||||
self._add_keypair()
|
self._add_keypair()
|
||||||
self.security_group = self._create_security_group()
|
self.security_group = self._create_security_group()
|
||||||
|
|
||||||
# boot a instance and create a timestamp file in it
|
# boot an instance and create a timestamp file in it
|
||||||
server = self._boot_image(CONF.compute.image_ref)
|
server = self._boot_image(CONF.compute.image_ref)
|
||||||
if CONF.compute.use_floatingip_for_ssh:
|
if CONF.compute.use_floatingip_for_ssh:
|
||||||
fip_for_server = self.create_floating_ip(server)
|
fip_for_server = self.create_floating_ip(server)
|
||||||
|
@ -150,7 +150,7 @@ class TestStampPattern(manager.ScenarioTest):
|
|||||||
'Snapshotting is not available.')
|
'Snapshotting is not available.')
|
||||||
@tempest.test.services('compute', 'network', 'volume', 'image')
|
@tempest.test.services('compute', 'network', 'volume', 'image')
|
||||||
def test_stamp_pattern(self):
|
def test_stamp_pattern(self):
|
||||||
# prepare for booting a instance
|
# prepare for booting an instance
|
||||||
self._add_keypair()
|
self._add_keypair()
|
||||||
self.security_group = self._create_security_group()
|
self.security_group = self._create_security_group()
|
||||||
|
|
||||||
|
2
tempest/thirdparty/boto/test.py
vendored
2
tempest/thirdparty/boto/test.py
vendored
@ -211,7 +211,7 @@ class BotoTestCase(tempest.test.BaseTestCase):
|
|||||||
def resource_setup(cls):
|
def resource_setup(cls):
|
||||||
super(BotoTestCase, cls).resource_setup()
|
super(BotoTestCase, cls).resource_setup()
|
||||||
cls.conclusion = decision_maker()
|
cls.conclusion = decision_maker()
|
||||||
# The trash contains cleanup functions and paramaters in tuples
|
# The trash contains cleanup functions and parameters in tuples
|
||||||
# (function, *args, **kwargs)
|
# (function, *args, **kwargs)
|
||||||
cls._resource_trash_bin = {}
|
cls._resource_trash_bin = {}
|
||||||
cls._sequence = -1
|
cls._sequence = -1
|
||||||
|
Loading…
Reference in New Issue
Block a user