Updated Branches: refs/heads/vmware-datamodel f1a5d7054 -> 6a8c2bd4e
Attributes for tests Removing simulator attribute as the NetworkACL related support is to be extended on the simulator. Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fb6eaa0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fb6eaa0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fb6eaa0 Branch: refs/heads/vmware-datamodel Commit: 7fb6eaa0ca5f0f58b23ab6af812db6366743717a Parents: be5639f Author: Prasanna Santhanam <t...@apache.org> Authored: Wed May 29 10:01:20 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed May 29 10:01:20 2013 +0530 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fb6eaa0/test/integration/smoke/test_internal_lb.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index 6c03900..07a5395 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fb6eaa0/test/integration/smoke/test_network_acl.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 66f0a6f..3ed45be 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fb6eaa0/test/integration/smoke/test_privategw_acl.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index af5c28b..9c37e5e 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
