Merge "Add a functional test option to skip notification tests"

heat_integrationtests/common/config.py

@@ -106,6 +106,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 "

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)

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