From 5738388a6216b8269ad5dc24a3e32c0f2b11f8fa Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Tue, 11 Aug 2015 11:44:42 +0900 Subject: [PATCH] Fix a few typos in log messages and comments a instance => an instance occured => occurred nessesary => necessary temprary => temporary Excercise => Exercise preceeding => preceding nu,ber => the number Remove unnecessary 'a' Change-Id: I9df2de6178bc73a05fea936fa2a3f26c3e6c09d3 --- apidocs/src/xslts/js/trc/schema/sampleManager.js | 2 +- trove/extensions/mgmt/instances/service.py | 4 ++-- trove/guestagent/datastore/experimental/db2/service.py | 6 +++--- trove/taskmanager/models.py | 2 +- trove/tests/api/mgmt/hosts.py | 2 +- trove/tests/unittests/guestagent/test_configuration.py | 2 +- trove/tests/unittests/guestagent/test_dbaas.py | 4 ++-- trove/tests/unittests/upgrade/test_models.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apidocs/src/xslts/js/trc/schema/sampleManager.js b/apidocs/src/xslts/js/trc/schema/sampleManager.js index edb05b7961..fb4be666ac 100644 --- a/apidocs/src/xslts/js/trc/schema/sampleManager.js +++ b/apidocs/src/xslts/js/trc/schema/sampleManager.js @@ -199,7 +199,7 @@ trc.schema.sampleManager = { code /* Code text to set (string) */) { // - // Preprocess the txt if nessesary... + // Preprocess the txt if necessary... // var ieVersion = trc.util.browser.detectIEVersion(); if ((ieVersion > -1) && diff --git a/trove/extensions/mgmt/instances/service.py b/trove/extensions/mgmt/instances/service.py index 0b8c505baf..2967671d8b 100644 --- a/trove/extensions/mgmt/instances/service.py +++ b/trove/extensions/mgmt/instances/service.py @@ -181,9 +181,9 @@ class MgmtInstanceController(InstanceController): @admin_context def diagnostics(self, req, tenant_id, id): - """Return a single instance diagnostics.""" + """Return instance diagnostics for a single instance.""" LOG.info(_("req : '%s'\n\n") % req) - LOG.info(_("Showing a instance diagnostics for instance '%s'") % id) + LOG.info(_("Showing instance diagnostics for the instance '%s'") % id) LOG.info(_("id : '%s'\n\n") % id) context = req.environ[wsgi.CONTEXT_KEY] diff --git a/trove/guestagent/datastore/experimental/db2/service.py b/trove/guestagent/datastore/experimental/db2/service.py index eccc8175f8..b61527aa70 100644 --- a/trove/guestagent/datastore/experimental/db2/service.py +++ b/trove/guestagent/datastore/experimental/db2/service.py @@ -239,7 +239,7 @@ class DB2Admin(object): next_marker = None LOG.debug("databases = %s." % str(databases)) except exception.ProcessExecutionError as pe: - LOG.exception(_("An error occured listing databases: %s.") % + LOG.exception(_("An error occurred listing databases: %s.") % pe.message) pass return databases, next_marker @@ -275,7 +275,7 @@ class DB2Admin(object): LOG.debug(pe) pass except exception.ProcessExecutionError as pe: - LOG.exception(_("An error occured creating users: %s.") % + LOG.exception(_("An error occurred creating users: %s.") % pe.message) pass @@ -304,7 +304,7 @@ class DB2Admin(object): LOG.debug("Revoked access for user:%s on database:%s." % ( userName, mydb.name)) except exception.ProcessExecutionError as pe: - LOG.debug("Error occured while revoking access to %s." % + LOG.debug("Error occurred while revoking access to %s." % mydb.name) pass try: diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 45860f85ed..6d82bfcf4f 100755 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -577,7 +577,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): This function is meant to be called with poll_until to check that the guest is alive before sending a 'create' message. This prevents - over billing a customer for a instance that they can never use. + over billing a customer for an instance that they can never use. Returns: boolean if the service is active. Raises: TroveError if the service is in a failure state. diff --git a/trove/tests/api/mgmt/hosts.py b/trove/tests/api/mgmt/hosts.py index cf053388ba..c3d72c17f4 100644 --- a/trove/tests/api/mgmt/hosts.py +++ b/trove/tests/api/mgmt/hosts.py @@ -113,7 +113,7 @@ class HostsMgmtCommands(object): assert_not_equal(len(result), 0, "list hosts should not be empty: %s" % str(result)) hosts = [] - # Find a host with a instanceCount > 0 + # Find a host with an instanceCount > 0 for host in result: msg = 'Host: %s, Count: %s' % (host.name, host.instanceCount) hosts.append(msg) diff --git a/trove/tests/unittests/guestagent/test_configuration.py b/trove/tests/unittests/guestagent/test_configuration.py index 4498ea00d4..32ecc0d1f5 100644 --- a/trove/tests/unittests/guestagent/test_configuration.py +++ b/trove/tests/unittests/guestagent/test_configuration.py @@ -96,7 +96,7 @@ class TestConfigurationOverrideStrategy(trove_testtools.TestCase): def tearDown(self): trove_testtools.TestCase.tearDown(self) - # Remove temprary files in the LIFO order. + # Remove temporary files in the LIFO order. while self._temp_files_paths: try: os.remove(self._temp_files_paths.pop()) diff --git a/trove/tests/unittests/guestagent/test_dbaas.py b/trove/tests/unittests/guestagent/test_dbaas.py index 7abb4f3f44..94e6d2e833 100644 --- a/trove/tests/unittests/guestagent/test_dbaas.py +++ b/trove/tests/unittests/guestagent/test_dbaas.py @@ -3064,8 +3064,8 @@ class VerticaAppTest(testtools.TestCase): with patch.object(self.app, 'read_config', return_value=self.test_config): self.app.install_cluster(members=['member1', 'member2']) - # Verifying nu,ber of shell calls, - # as command has already been tested in preceeding tests + # Verifying the number of shell calls, + # as command has already been tested in preceding tests self.assertEqual(5, vertica_system.shell_execute.call_count) def test__enable_db_on_boot(self): diff --git a/trove/tests/unittests/upgrade/test_models.py b/trove/tests/unittests/upgrade/test_models.py index 12869ac05d..7627006fa8 100644 --- a/trove/tests/unittests/upgrade/test_models.py +++ b/trove/tests/unittests/upgrade/test_models.py @@ -68,7 +68,7 @@ class TestUpgradeModel(trove_testtools.TestCase): @patch.object(rpc, 'get_client') def _assert_create_with_metadata(self, mock_client, api_upgrade_mock, metadata=None): - """Excercise UpgradeMessageSender.create() call. + """Exercise UpgradeMessageSender.create() call. """ context = Mock()