Merge "Add a functional test option to skip notification tests"
diff --git a/common/config.py b/common/config.py
index 75f1dbf..5a33590 100644
--- a/common/config.py
+++ b/common/config.py
@@ -106,6 +106,9 @@
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/functional/test_notifications.py b/functional/test_notifications.py
index a4c419c..c729a67 100644
--- a/functional/test_notifications.py
+++ b/functional/test_notifications.py
@@ -124,6 +124,8 @@
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)