From: Rongze Zhu Date: Thu, 23 Aug 2012 03:00:08 +0000 (+0000) Subject: Typo fix in cinder: existant => existent X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8b92df9febce5bc45fa57bb347779b9644a38c44;p=openstack-build%2Fcinder-build.git Typo fix in cinder: existant => existent Impact: * locale message in cinder/locale/*/LC_MESSAGES/nova.po * locale message in cinder/locale/nova.po * Test function names * Test strings and comments Change-Id: I623af176d3b556a1ea9f8bde2c609fc4f752d7da --- diff --git a/cinder/locale/bs/LC_MESSAGES/nova.po b/cinder/locale/bs/LC_MESSAGES/nova.po index d241aa345..b59cd8db3 100644 --- a/cinder/locale/bs/LC_MESSAGES/nova.po +++ b/cinder/locale/bs/LC_MESSAGES/nova.po @@ -3432,7 +3432,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/cs/LC_MESSAGES/nova.po b/cinder/locale/cs/LC_MESSAGES/nova.po index 254125404..ebca59716 100644 --- a/cinder/locale/cs/LC_MESSAGES/nova.po +++ b/cinder/locale/cs/LC_MESSAGES/nova.po @@ -3505,7 +3505,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/da/LC_MESSAGES/nova.po b/cinder/locale/da/LC_MESSAGES/nova.po index 1065a9e4a..d3e0765d1 100644 --- a/cinder/locale/da/LC_MESSAGES/nova.po +++ b/cinder/locale/da/LC_MESSAGES/nova.po @@ -3432,7 +3432,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/de/LC_MESSAGES/nova.po b/cinder/locale/de/LC_MESSAGES/nova.po index 7df64ace4..e5b8feee4 100644 --- a/cinder/locale/de/LC_MESSAGES/nova.po +++ b/cinder/locale/de/LC_MESSAGES/nova.po @@ -3437,7 +3437,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/en_AU/LC_MESSAGES/nova.po b/cinder/locale/en_AU/LC_MESSAGES/nova.po index f129ee4f3..e23929f19 100644 --- a/cinder/locale/en_AU/LC_MESSAGES/nova.po +++ b/cinder/locale/en_AU/LC_MESSAGES/nova.po @@ -3452,7 +3452,7 @@ msgstr "Adding console" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "Tried to remove non-existent console %(console_id)s." #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/en_GB/LC_MESSAGES/nova.po b/cinder/locale/en_GB/LC_MESSAGES/nova.po index d397c19ca..e816526c8 100644 --- a/cinder/locale/en_GB/LC_MESSAGES/nova.po +++ b/cinder/locale/en_GB/LC_MESSAGES/nova.po @@ -3443,7 +3443,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/es/LC_MESSAGES/nova.po b/cinder/locale/es/LC_MESSAGES/nova.po index 59acf61fd..0822c7572 100644 --- a/cinder/locale/es/LC_MESSAGES/nova.po +++ b/cinder/locale/es/LC_MESSAGES/nova.po @@ -3459,7 +3459,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/fr/LC_MESSAGES/nova.po b/cinder/locale/fr/LC_MESSAGES/nova.po index 8a0e4432e..f24fca003 100644 --- a/cinder/locale/fr/LC_MESSAGES/nova.po +++ b/cinder/locale/fr/LC_MESSAGES/nova.po @@ -3482,8 +3482,8 @@ msgstr "Ajout de console" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." -msgstr "Tentative de suppression d'une console non existante %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." +msgstr "Tentative de suppression d'une console non existente %(console_id)s." #: cinder/console/vmrc_manager.py:122 #, python-format diff --git a/cinder/locale/it/LC_MESSAGES/nova.po b/cinder/locale/it/LC_MESSAGES/nova.po index f1a3a8945..0ac178617 100644 --- a/cinder/locale/it/LC_MESSAGES/nova.po +++ b/cinder/locale/it/LC_MESSAGES/nova.po @@ -3440,7 +3440,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/ja/LC_MESSAGES/nova.po b/cinder/locale/ja/LC_MESSAGES/nova.po index 40bb6e9bb..c81827f25 100644 --- a/cinder/locale/ja/LC_MESSAGES/nova.po +++ b/cinder/locale/ja/LC_MESSAGES/nova.po @@ -3446,7 +3446,7 @@ msgstr "コンソールを追加しています" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "存在しないコンソール %(console_id)s を削除しようとしました" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/ko/LC_MESSAGES/nova.po b/cinder/locale/ko/LC_MESSAGES/nova.po index 92eca8c5d..ed2ab5d9c 100644 --- a/cinder/locale/ko/LC_MESSAGES/nova.po +++ b/cinder/locale/ko/LC_MESSAGES/nova.po @@ -3437,7 +3437,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/nova.pot b/cinder/locale/nova.pot index 3be91ed40..be9265796 100644 --- a/cinder/locale/nova.pot +++ b/cinder/locale/nova.pot @@ -3432,7 +3432,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/pt_BR/LC_MESSAGES/nova.po b/cinder/locale/pt_BR/LC_MESSAGES/nova.po index 6cf123994..8357b620c 100644 --- a/cinder/locale/pt_BR/LC_MESSAGES/nova.po +++ b/cinder/locale/pt_BR/LC_MESSAGES/nova.po @@ -3446,7 +3446,7 @@ msgstr "Adicionando console" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/ru/LC_MESSAGES/nova.po b/cinder/locale/ru/LC_MESSAGES/nova.po index 708862662..a934ed76f 100644 --- a/cinder/locale/ru/LC_MESSAGES/nova.po +++ b/cinder/locale/ru/LC_MESSAGES/nova.po @@ -3527,7 +3527,7 @@ msgstr "Добавление консоли" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "Выполнена попытка удаления несуществующей консоли %(console_id)s." #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/tl/LC_MESSAGES/nova.po b/cinder/locale/tl/LC_MESSAGES/nova.po index 79476adea..6161a8c26 100644 --- a/cinder/locale/tl/LC_MESSAGES/nova.po +++ b/cinder/locale/tl/LC_MESSAGES/nova.po @@ -3432,7 +3432,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/tr/LC_MESSAGES/nova.po b/cinder/locale/tr/LC_MESSAGES/nova.po index 7d979e4ca..cfd3db0d8 100644 --- a/cinder/locale/tr/LC_MESSAGES/nova.po +++ b/cinder/locale/tr/LC_MESSAGES/nova.po @@ -3432,7 +3432,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/uk/LC_MESSAGES/nova.po b/cinder/locale/uk/LC_MESSAGES/nova.po index 46ea259e9..ab3fffddb 100644 --- a/cinder/locale/uk/LC_MESSAGES/nova.po +++ b/cinder/locale/uk/LC_MESSAGES/nova.po @@ -3434,7 +3434,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/zh_CN/LC_MESSAGES/nova.po b/cinder/locale/zh_CN/LC_MESSAGES/nova.po index 0abf37b5a..53a912cd1 100644 --- a/cinder/locale/zh_CN/LC_MESSAGES/nova.po +++ b/cinder/locale/zh_CN/LC_MESSAGES/nova.po @@ -3470,7 +3470,7 @@ msgstr "正在添加控制台" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "尝试删除不存在的控制台%(console_id)s。" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/locale/zh_TW/LC_MESSAGES/nova.po b/cinder/locale/zh_TW/LC_MESSAGES/nova.po index afae8959a..2a93395a2 100644 --- a/cinder/locale/zh_TW/LC_MESSAGES/nova.po +++ b/cinder/locale/zh_TW/LC_MESSAGES/nova.po @@ -3437,7 +3437,7 @@ msgstr "" #: cinder/console/manager.py:97 #, python-format -msgid "Tried to remove non-existant console %(console_id)s." +msgid "Tried to remove non-existent console %(console_id)s." msgstr "" #: cinder/console/vmrc_manager.py:122 diff --git a/cinder/tests/test_nova_rootwrap.py b/cinder/tests/test_nova_rootwrap.py index 47f176a2f..0819a556f 100644 --- a/cinder/tests/test_nova_rootwrap.py +++ b/cinder/tests/test_nova_rootwrap.py @@ -30,7 +30,7 @@ class RootwrapTestCase(test.TestCase): filters.RegExpFilter("/bin/ls", "root", 'ls', '/[a-z]+'), filters.CommandFilter("/usr/bin/foo_bar_not_exist", "root"), filters.RegExpFilter("/bin/cat", "root", 'cat', '/[a-z]+'), - filters.CommandFilter("/nonexistant/cat", "root"), + filters.CommandFilter("/nonexistent/cat", "root"), filters.CommandFilter("/bin/cat", "root") # Keep this one last ] @@ -85,7 +85,7 @@ class RootwrapTestCase(test.TestCase): # Our own PID does not match /bin/sleep, so it should fail self.assertFalse(f.match(usercmd) or f2.match(usercmd)) usercmd = ['kill', 999999] - # Nonexistant PID should fail + # Nonexistent PID should fail self.assertFalse(f.match(usercmd) or f2.match(usercmd)) usercmd = ['kill', p.pid] # Providing no signal should work diff --git a/cinder/tests/test_volume_types.py b/cinder/tests/test_volume_types.py index f0f6f1821..8650b4c05 100644 --- a/cinder/tests/test_volume_types.py +++ b/cinder/tests/test_volume_types.py @@ -80,7 +80,7 @@ class VolumeTypeTestCase(test.TestCase): vol_types = volume_types.get_all_types(self.ctxt) self.assertEqual(total_volume_types, len(vol_types)) - def test_non_existant_vol_type_shouldnt_delete(self): + def test_non_existent_vol_type_shouldnt_delete(self): """Ensures that volume type creation fails with invalid args""" self.assertRaises(exception.VolumeTypeNotFoundByName, volume_types.destroy, self.ctxt, "sfsfsdfdfs") diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py index 09fff2399..87eb6a25f 100644 --- a/cinder/tests/test_wsgi.py +++ b/cinder/tests/test_wsgi.py @@ -68,7 +68,7 @@ document_root = /tmp self.assertRaises( cinder.exception.PasteAppNotFound, self.loader.load_app, - "non-existant app", + "non-existent app", ) def test_app_found(self):