From 81f817890674df55323704c6bbeba4bd086a47d3 Mon Sep 17 00:00:00 2001 From: eprohoda Date: Fri, 13 Nov 2015 17:51:05 +0200 Subject: [PATCH] Misprints in English words Fix misprints in class, method names, comments, etc. Closes-Bug: #1516044 Change-Id: I9ed73165a06976bc1bfa8630615527fc97dd9fda --- doc/base_tests.rst | 4 ++-- doc/helpers.rst | 2 +- .../test_master_node_failover.py | 2 +- .../tests/strength/destroy_controllers.py | 20 +++++++++---------- system_test/tests/strength/strength_base.py | 6 +++--- utils/jenkins/system_tests.sh | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/base_tests.rst b/doc/base_tests.rst index 71d2e152f..d48b2af9f 100644 --- a/doc/base_tests.rst +++ b/doc/base_tests.rst @@ -1,6 +1,6 @@ .. index:: Base tests -General Openstack/Fuel Tests +General OpenStack/Fuel Tests **************************** General tests @@ -337,7 +337,7 @@ Test Upgrade Chains OS upgrade tests ================ -Test Openstack Upgrades +Test OpenStack Upgrades ----------------------- .. automodule:: fuelweb_test.tests.test_os_upgrade :members: diff --git a/doc/helpers.rst b/doc/helpers.rst index 88c8af985..b8e7b2c70 100644 --- a/doc/helpers.rst +++ b/doc/helpers.rst @@ -98,7 +98,7 @@ Regenerate Repo .. automodule:: fuelweb_test.helpers.regenerate_repo :members: -Replace Reposiroties +Replace Repositories -------------------- .. automodule:: fuelweb_test.helpers.replace_repos :members: diff --git a/fuelweb_test/tests/tests_strength/test_master_node_failover.py b/fuelweb_test/tests/tests_strength/test_master_node_failover.py index b6101336d..3b23586b8 100644 --- a/fuelweb_test/tests/tests_strength/test_master_node_failover.py +++ b/fuelweb_test/tests/tests_strength/test_master_node_failover.py @@ -71,7 +71,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic): 7. Verify network configuration on controller 8. Run OSTF 9. Shut down master node - 10. Run openstack verification + 10. Run OpenStack verification Duration 1000m """ diff --git a/system_test/tests/strength/destroy_controllers.py b/system_test/tests/strength/destroy_controllers.py index eb787acc7..c0d7f8459 100644 --- a/system_test/tests/strength/destroy_controllers.py +++ b/system_test/tests/strength/destroy_controllers.py @@ -21,7 +21,7 @@ from system_test.helpers.decorators import deferred_decorator from system_test.helpers.decorators import action -class StrenghtDestroyFirstContorller(strength_base.StrenghtBaseActions): +class StrengthDestroyFirstController(strength_base.StrengthBaseActions): """Destroy two controllers and check pacemaker status is correct Scenario: @@ -56,7 +56,7 @@ class StrenghtDestroyFirstContorller(strength_base.StrenghtBaseActions): 'network_check', 'health_check', 'save_load_environment', - 'destory_first_controller', + 'destroy_first_controller', 'check_pacemaker_status', 'wait_offline_nodes', 'check_ha_service_ready', @@ -67,12 +67,12 @@ class StrenghtDestroyFirstContorller(strength_base.StrenghtBaseActions): @deferred_decorator([make_snapshot_if_step_fail]) @action - def destory_first_controller(self): + def destroy_first_controller(self): """Destroy first controller""" - self._destory_controller('slave-01') + self._destroy_controller('slave-01') -class StrenghtDestroySecondContorller(strength_base.StrenghtBaseActions): +class StrengthDestroySecondController(strength_base.StrengthBaseActions): """Destroy two controllers and check pacemaker status is correct Scenario: @@ -107,7 +107,7 @@ class StrenghtDestroySecondContorller(strength_base.StrenghtBaseActions): 'network_check', 'health_check', 'save_load_environment', - 'destory_second_controller', + 'destroy_second_controller', 'check_pacemaker_status', 'wait_offline_nodes', 'check_ha_service_ready', @@ -118,12 +118,12 @@ class StrenghtDestroySecondContorller(strength_base.StrenghtBaseActions): @deferred_decorator([make_snapshot_if_step_fail]) @action - def destory_second_controller(self): + def destroy_second_controller(self): """Destroy second controller""" - self._destory_controller('slave-02') + self._destroy_controller('slave-02') @factory def cases(): - return (case_factory(StrenghtDestroyFirstContorller) + - case_factory(StrenghtDestroySecondContorller)) + return (case_factory(StrengthDestroyFirstController) + + case_factory(StrengthDestroySecondController)) diff --git a/system_test/tests/strength/strength_base.py b/system_test/tests/strength/strength_base.py index 8699f5f88..1f8ca07a1 100644 --- a/system_test/tests/strength/strength_base.py +++ b/system_test/tests/strength/strength_base.py @@ -24,15 +24,15 @@ from system_test.helpers.decorators import action from system_test import logger -class StrenghtBaseActions(actions_base.ActionsBase): +class StrengthBaseActions(actions_base.ActionsBase): def __init__(self, config=None): - super(StrenghtBaseActions, self).__init__(config) + super(StrengthBaseActions, self).__init__(config) self.destroyed_devops_nodes = [] self.ostf_tests_should_failed = 0 self.os_service_should_failed = 0 - def _destory_controller(self, devops_node_name): + def _destroy_controller(self, devops_node_name): logger.info("Suspend {} node".format(devops_node_name)) d_node = self.env.d_env.get_node(name=devops_node_name) d_node.suspend(False) diff --git a/utils/jenkins/system_tests.sh b/utils/jenkins/system_tests.sh index ed9dde7bf..9825bf2d9 100755 --- a/utils/jenkins/system_tests.sh +++ b/utils/jenkins/system_tests.sh @@ -129,7 +129,7 @@ GlobalVariables() { USE_MIRROR="${USE_MIRROR:=srt}" # only show what commands would be executed but do nothing - # this feature is usefull if you want to debug this script's behaviour + # this feature is useful if you want to debug this script's behaviour DRY_RUN="${DRY_RUN:=no}" VENV="${VENV:=yes}"