From f2a581ee286832204b8eed938384e0430a62c4ab Mon Sep 17 00:00:00 2001 From: Pavel Kholkin Date: Tue, 24 Feb 2015 19:20:50 +0300 Subject: [PATCH] Fixed redeclared test_names Fixed redeclared test_names for two test functions that pass now: 1) 'test_list_security_groups_all_tenants_on' 2) 'test_find_by_str_name' Small spelling corrections TrivialFix Change-Id: Iacb0ce5697779f9342c22a22cb2f29a8e063b459 --- novaclient/tests/unit/test_utils.py | 8 ++++---- novaclient/tests/unit/v2/test_security_groups.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/novaclient/tests/unit/test_utils.py b/novaclient/tests/unit/test_utils.py index 51b824f20..2e72ef659 100644 --- a/novaclient/tests/unit/test_utils.py +++ b/novaclient/tests/unit/test_utils.py @@ -126,7 +126,7 @@ class FindResourceTestCase(test_utils.TestCase): output = utils.find_resource(self.manager, 'UPPER') self.assertEqual(output, self.manager.get('12345')) - def test_find_by_str_name(self): + def test_find_by_str_lower_name(self): output = utils.find_resource(self.manager, 'lower') self.assertEqual(output, self.manager.get('123456')) @@ -134,16 +134,16 @@ class FindResourceTestCase(test_utils.TestCase): output = utils.find_resource(self.manager, 'Mixed') self.assertEqual(output, self.manager.get('1234567')) - def test_find_by_str_lower_name(self): + def test_find_by_str_lower_name_mixed(self): output = utils.find_resource(self.manager, 'mixed') self.assertEqual(output, self.manager.get('12345678')) - def test_find_by_str_displayname(self): + def test_find_by_str_display_name(self): display_manager = FakeDisplayManager(None) output = utils.find_resource(display_manager, 'entity_three') self.assertEqual(output, display_manager.get('4242')) - def test_find_in_alphanum_allowd_manager_by_str_id_(self): + def test_find_in_alphanum_allowed_manager_by_str_id_(self): alphanum_manager = FakeManager(True) output = utils.find_resource(alphanum_manager, '01234') self.assertEqual(output, alphanum_manager.get('01234')) diff --git a/novaclient/tests/unit/v2/test_security_groups.py b/novaclient/tests/unit/v2/test_security_groups.py index 9aeb8dde8..d05a93aa1 100644 --- a/novaclient/tests/unit/v2/test_security_groups.py +++ b/novaclient/tests/unit/v2/test_security_groups.py @@ -32,7 +32,7 @@ class SecurityGroupsTest(utils.FixturedTestCase): self._do_test_list_security_groups( None, '/os-security-groups') - def test_list_security_groups_all_tenants_on(self): + def test_list_security_groups_all_tenants_on_with_search_opts(self): self._do_test_list_security_groups( {'all_tenants': 1}, '/os-security-groups?all_tenants=1')