Updated Branches: refs/heads/master ccac84c46 -> be5639f7e
Adding environment attributes to tests - test_internal_lb _ test_privategw_acl 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/be5639f7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be5639f7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be5639f7 Branch: refs/heads/master Commit: be5639f7e278aca722757475139a61b69df0163c Parents: ccac84c Author: Prasanna Santhanam <t...@apache.org> Authored: Wed May 29 09:48:25 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed May 29 09:48:25 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_internal_lb.py | 2 ++ test/integration/smoke/test_privategw_acl.py | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5639f7/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 ae64297..6c03900 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -22,6 +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 TestInternalLb(cloudstackTestCase): @@ -97,6 +98,7 @@ class TestInternalLb(cloudstackTestCase): + @attr(tags=["simulator", "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/be5639f7/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 5daf6ca..af5c28b 100644 --- a/test/integration/smoke/test_privategw_acl.py +++ b/test/integration/smoke/test_privategw_acl.py @@ -22,6 +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 TestPrivateGwACL(cloudstackTestCase): @@ -37,6 +38,8 @@ class TestPrivateGwACL(cloudstackTestCase): self.templateId = 5 self.privateGwId = None + + @attr(tags=["simulator", "advanced"]) def test_privategw_acl(self): # 1) Create VPC
