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:47:46 UTC

git commit: updated refs/heads/master to 0332a23

Repository: cloudstack
Updated Branches:
  refs/heads/master e62df62d9 -> 0332a23aa


Removing basic tag from few test cases which should not be run on basic zone


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

Branch: refs/heads/master
Commit: 0332a23aa73bf7551e2e6d86d6642b5ca22caf8c
Parents: e62df62
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Jul 25 17:00:12 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Jul 25 19:17:25 2014 +0530

----------------------------------------------------------------------
 .../component/test_multiple_ips_per_nic.py      | 22 +++++---------------
 1 file changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0332a23a/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index abe9474..7de2f40 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -197,7 +197,7 @@ class TestBasicOperations(cloudstackTestCase):
         return
 
     @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
-    @attr(tags=["basic","advanced"])
+    @attr(tags=["advanced"])
     def test_add_ip_to_nic(self, value):
         """ Add secondary IP to NIC of a VM"""
 
@@ -218,9 +218,6 @@ class TestBasicOperations(cloudstackTestCase):
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
         self.cleanup.append(self.account)
 
-        if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
-            self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
-
         network = createNetwork(self, value)
 
         try:
@@ -256,7 +253,7 @@ class TestBasicOperations(cloudstackTestCase):
         return
 
     @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
-    @attr(tags=["basic","advanced"])
+    @attr(tags=["advanced"])
     def test_remove_ip_from_nic(self, value):
         """ Remove secondary IP from NIC of a VM"""
 
@@ -274,9 +271,6 @@ class TestBasicOperations(cloudstackTestCase):
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
         self.cleanup.append(self.account)
 
-        if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
-            self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
-
         network = createNetwork(self, value)
 
         try:
@@ -303,7 +297,7 @@ class TestBasicOperations(cloudstackTestCase):
             self.debug("Removing invalid IP failed as expected with Exception %s" % e)
         return
 
-    @attr(tags=["basic","advanced"])
+    @attr(tags=["advanced"])
     def test_remove_invalid_ip(self):
         """ Remove invalid ip"""
 
@@ -321,7 +315,7 @@ class TestBasicOperations(cloudstackTestCase):
         return
 
     @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
-    @attr(tags=["basic","advanced"])
+    @attr(tags=["advanced"])
     def test_list_nics(self, value):
         """Test listing nics associated with the ip address"""
 
@@ -348,9 +342,6 @@ class TestBasicOperations(cloudstackTestCase):
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
         self.cleanup.append(self.account)
 
-        if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
-            self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
-
         network = createNetwork(self, value)
 
         try:
@@ -403,7 +394,7 @@ class TestBasicOperations(cloudstackTestCase):
         return
 
     @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
-    @attr(tags=["basic","advanced"])
+    @attr(tags=["advanced"])
     def test_operations_non_root_admin_api_client(self, value):
         """Test basic operations using non root admin apii client"""
 
@@ -428,9 +419,6 @@ class TestBasicOperations(cloudstackTestCase):
 
         apiclient = self.testClient.getUserApiClient(UserName=self.account.name, DomainName=self.account.domain)
 
-        if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
-            self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
-
         network = createNetwork(self, value)
 
         try: