From c47620703ce834ffadaeaefea34ee59eb3c3c1ac Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Wed, 29 Jul 2015 12:15:47 +1000 Subject: [PATCH] Add a functional test option to skip notification tests When running a standalone heat this can never pass. Change-Id: Ibf435d6bec241904ada86d5786d69e7618adc13f --- heat_integrationtests/common/config.py | 3 +++ heat_integrationtests/functional/test_notifications.py | 2 ++ heat_integrationtests/heat_integrationtests.conf.sample | 3 +++ 3 files changed, 8 insertions(+) diff --git a/heat_integrationtests/common/config.py b/heat_integrationtests/common/config.py index 0de648045..fd440750c 100644 --- a/heat_integrationtests/common/config.py +++ b/heat_integrationtests/common/config.py @@ -105,6 +105,9 @@ IntegrationTestGroup = [ cfg.BoolOpt('skip_stack_abandon_tests', default=False, help="Skip Stack Abandon Integration tests"), + cfg.BoolOpt('skip_notification_tests', + default=False, + help="Skip Notification Integration tests"), cfg.IntOpt('connectivity_timeout', default=120, help="Timeout in seconds to wait for connectivity to " diff --git a/heat_integrationtests/functional/test_notifications.py b/heat_integrationtests/functional/test_notifications.py index a4c419c24..c729a67f6 100644 --- a/heat_integrationtests/functional/test_notifications.py +++ b/heat_integrationtests/functional/test_notifications.py @@ -124,6 +124,8 @@ outputs: def setUp(self): super(NotificationTest, self).setUp() + if self.conf.skip_notification_tests: + self.skipTest('Testing Notifications disabled in conf, skipping') self.client = self.orchestration_client self.exchange = kombu.Exchange('heat', 'topic', durable=False) diff --git a/heat_integrationtests/heat_integrationtests.conf.sample b/heat_integrationtests/heat_integrationtests.conf.sample index b1a30517d..4f8f269cd 100644 --- a/heat_integrationtests/heat_integrationtests.conf.sample +++ b/heat_integrationtests/heat_integrationtests.conf.sample @@ -90,6 +90,9 @@ # Skip Stack Abandon Integration tests (boolean value) #skip_stack_abandon_tests = false +# Skip Notification Integration tests (boolean value) +#skip_notification_tests = false + # Timeout in seconds to wait for connectivity to server. (integer value) #connectivity_timeout = 120