From 7fb6eaa0ca5f0f58b23ab6af812db6366743717a Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Wed, 29 May 2013 10:01:20 +0530 Subject: [PATCH] Attributes for tests Removing simulator attribute as the NetworkACL related support is to be extended on the simulator. Signed-off-by: Prasanna Santhanam --- test/integration/smoke/test_internal_lb.py | 2 +- test/integration/smoke/test_network_acl.py | 3 ++- test/integration/smoke/test_privategw_acl.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index 6c039004ab5..07a539592ca 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -98,7 +98,7 @@ class TestInternalLb(cloudstackTestCase): - @attr(tags=["simulator", "advanced"]) + @attr(tags=["advanced"]) def test_internallb(self): #1) Create and enable network offering with Internal Lb vm service diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 66f0a6fc1c5..3ed45be9cd0 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -22,7 +22,7 @@ from marvin.cloudstackAPI import * from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * - +from nose.plugins.attrib import attr class TestNetworkACL(cloudstackTestCase): networkOfferingId = 11 @@ -40,6 +40,7 @@ class TestNetworkACL(cloudstackTestCase): + @attr(tags=["advanced"]) def test_networkAcl(self): # 1) Create VPC diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index af5c28b5b2b..9c37e5e7fc0 100644 --- a/test/integration/smoke/test_privategw_acl.py +++ b/test/integration/smoke/test_privategw_acl.py @@ -39,7 +39,7 @@ class TestPrivateGwACL(cloudstackTestCase): self.privateGwId = None - @attr(tags=["simulator", "advanced"]) + @attr(tags=["advanced"]) def test_privategw_acl(self): # 1) Create VPC