From e8e457db4e5fc4a143e4c99e4fe6bae1e6de0997 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Fri, 9 Nov 2012 21:41:47 +0000 Subject: [PATCH] Sync up notification handler test naming Change-Id: I0b47e7720b7bc2e503b51a7f783d55e7813e74c7 --- .../{test_handler => test_notification_handler}/__init__.py | 6 ++---- .../test_nova.py | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) rename moniker/tests/{test_handler => test_notification_handler}/__init__.py (91%) rename moniker/tests/{test_handler => test_notification_handler}/test_nova.py (95%) diff --git a/moniker/tests/test_handler/__init__.py b/moniker/tests/test_notification_handler/__init__.py similarity index 91% rename from moniker/tests/test_handler/__init__.py rename to moniker/tests/test_notification_handler/__init__.py index 3b4b36182..09f51d335 100644 --- a/moniker/tests/test_handler/__init__.py +++ b/moniker/tests/test_notification_handler/__init__.py @@ -15,8 +15,6 @@ # under the License. import json import os -from moniker.openstack.common import cfg -from moniker import storage from moniker.tests import TestCase FIXTURES_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), @@ -24,11 +22,11 @@ FIXTURES_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), 'sample_notifications')) -class HandlerTestCase(TestCase): +class NotificationHandlerTestCase(TestCase): __test__ = False def setUp(self): - super(HandlerTestCase, self).setUp() + super(NotificationHandlerTestCase, self).setUp() self.central_service = self.get_central_service() def get_notification_fixture(self, service, name): diff --git a/moniker/tests/test_handler/test_nova.py b/moniker/tests/test_notification_handler/test_nova.py similarity index 95% rename from moniker/tests/test_handler/test_nova.py rename to moniker/tests/test_notification_handler/test_nova.py index 507b8a6a5..9c39b270b 100644 --- a/moniker/tests/test_handler/test_nova.py +++ b/moniker/tests/test_notification_handler/test_nova.py @@ -16,17 +16,17 @@ from nose import SkipTest from moniker.openstack.common import cfg from moniker.openstack.common import log as logging -from moniker.tests.test_handler import HandlerTestCase +from moniker.tests.test_notification_handler import NotificationHandlerTestCase from moniker.notification_handler import nova LOG = logging.getLogger(__name__) -class NovaHandlerTest(HandlerTestCase): +class NovaNotificationHandlerTestCase(NotificationHandlerTestCase): __test__ = True def setUp(self): - super(NovaHandlerTest, self).setUp() + super(NovaNotificationHandlerTestCase, self).setUp() self._init_handler()