From b303fd34283f21afae1e2238fe5e484aef0fb91c Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 1 Aug 2013 16:09:07 +0530 Subject: [PATCH] CLOUDSTACK-3999: Fix the skipTest typo Signed-off-by: Prasanna Santhanam --- .../test_redundant_router_deployment_planning.py | 8 ++++---- test/integration/smoke/test_deploy_vm_with_userdata.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/integration/component/test_redundant_router_deployment_planning.py b/test/integration/component/test_redundant_router_deployment_planning.py index c8aac06c033..75fc3abed96 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 self.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 self.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 self.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 self.SkipTest( + raise self.skipTest( "The env don't have 2 hosts req for test") self.debug("disable all pods except one!") diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py index 260106cbb0f..8910b2e8f89 100644 --- a/test/integration/smoke/test_deploy_vm_with_userdata.py +++ b/test/integration/smoke/test_deploy_vm_with_userdata.py @@ -71,6 +71,7 @@ class TestDeployVmWithUserData(cloudstackTestCase): cls.services["service_offering"] ) cls.account = Account.create(cls.apiClient, services=cls.services["account"]) + cls.cleanup = [cls.account] cls.template = get_template( cls.apiClient, cls.zone.id, @@ -79,7 +80,7 @@ class TestDeployVmWithUserData(cloudstackTestCase): cls.debug("Successfully created account: %s, id: \ %s" % (cls.account.name,\ cls.account.id)) - cls.cleanup = [cls.account] + # Generate userdata of 2500 bytes. This is larger than the 2048 bytes limit. # CS however allows for upto 4K bytes in the code. So this must succeed.