commit c1f1e83877c8693fab69e74ed45e1ead3db43a3b
author Yair Fried <yfried@redhat.com> Sun Sep 21 12:57:32 2014 +0300
committer Yair Fried <yfried@redhat.com> Sun Sep 28 11:30:30 2014 +0000
tree 889d73c146d3c07992ccaf84bd9d690b4f2c0087
parent d1848f022206b5f1c6f35db94a42c3da566780ac

Skip large_ops_scenario if large_ops_number < 1

test_large_ops_scenario does nothing if CONF.scenario.large_ops_number < 1
Set to skip with appropriate message instead

Change-Id: I30843dcaaa4d71efd151f550cb1e5b43b309e198

tempest/scenario/test_large_ops.py

diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py
index a7ea70f..71b8a7f 100644
--- a/tempest/scenario/test_large_ops.py
+++ b/tempest/scenario/test_large_ops.py
@@ -39,6 +39,9 @@
 
     @classmethod
     def setUpClass(cls):
+        if CONF.scenario.large_ops_number < 1:
+            raise cls.skipException("large_ops_number not set to multiple "
+                                    "instances")
         cls.set_network_resources()
         super(TestLargeOpsScenario, cls).setUpClass()
 
@@ -75,8 +78,6 @@
         self._wait_for_server_status('ACTIVE')
 
     def _large_ops_scenario(self):
-        if CONF.scenario.large_ops_number < 1:
-            return
         self.glance_image_create()
         self.nova_boot()