You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/07/25 15:41:14 UTC

git commit: updated refs/heads/master to 97b9e86

Repository: cloudstack
Updated Branches:
  refs/heads/master 9245b7b71 -> 97b9e8656


Skipping test instead of raising exception in case enough zones are not present for it to run on


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97b9e865
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97b9e865
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97b9e865

Branch: refs/heads/master
Commit: 97b9e865611448515889b00cefa33d8ee5ad0d98
Parents: 9245b7b
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Jul 25 17:20:50 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Jul 25 19:10:49 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_escalations_isos.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97b9e865/test/integration/component/test_escalations_isos.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_isos.py b/test/integration/component/test_escalations_isos.py
index 387a681..a0fa333 100644
--- a/test/integration/component/test_escalations_isos.py
+++ b/test/integration/component/test_escalations_isos.py
@@ -624,7 +624,7 @@ class TestIsos(cloudstackTestCase):
                           "Failed to list Zones"
                           )
         if not len(zones_list) > 1:
-            self.fail("Enough zones doesnot exists to copy iso")
+            self.skipTest("Enough zones doesnot exists to copy iso")
         else:
             # Listing all the ISO's for a User in Zone 1
             list_isos_zone1 = Iso.list(
@@ -780,4 +780,4 @@ class TestIsos(cloudstackTestCase):
                               "Failed to copy ISO"
                               )
         del self.services["iso"]["zoneid"]
-        return
\ No newline at end of file
+        return