Updated Branches: refs/heads/master f4dd80989 -> 1efa54243
CLOUDSTACK-3929: Remove references to unittest. Skip is done using cloudstackTestCase inheriting from unittest as self.SKipTest Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 797450a5ba085f36bfd0bee620e6a64c6d589fd1) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1efa5424 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1efa5424 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1efa5424 Branch: refs/heads/master Commit: 1efa542433fc5c2dff5022f1bab3bc9ad917e480 Parents: f4dd809 Author: Prasanna Santhanam <[email protected]> Authored: Tue Jul 30 12:40:45 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Tue Jul 30 12:41:18 2013 +0530 ---------------------------------------------------------------------- .../component/test_redundant_router_deployment_planning.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1efa5424/test/integration/component/test_redundant_router_deployment_planning.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_redundant_router_deployment_planning.py b/test/integration/component/test_redundant_router_deployment_planning.py index 744be12..c8aac06 100644 --- a/test/integration/component/test_redundant_router_deployment_planning.py +++ b/test/integration/component/test_redundant_router_deployment_planning.py @@ -233,7 +233,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(pods) < 2: - raise unittest.SkipTest("The env don't have 2 pods req for test") + raise self.SkipTest("The env don't have 2 pods req for test") # Creating network using the network offering created self.debug("Creating network with network offering: %s" % @@ -380,7 +380,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): "List clusters should not return empty response" ) if len(clusters) < 2: - raise unittest.SkipTest( + raise self.SkipTest( "The env don't have 2 clusters req for test") self.debug("disable all pods except one!") @@ -600,7 +600,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(storage_pools) < 2: - raise unittest.SkipTest( + raise self.SkipTest( "The env don't have 2 storage pools req for test") self.debug("disable all pods except one!") @@ -841,7 +841,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(hosts) < 2: - raise unittest.SkipTest( + raise self.SkipTest( "The env don't have 2 hosts req for test") self.debug("disable all pods except one!")
