Repository: cloudstack Updated Branches: refs/heads/4.4-forward 98df3e55b -> cc0ed93a1
Fixed test_pvlan.py to get correct zone id Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc0ed93a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc0ed93a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc0ed93a Branch: refs/heads/4.4-forward Commit: cc0ed93a135e3ff0409b690fa484c4c98afff23e Parents: 98df3e5 Author: Girish Shilamkar <gir...@clogeny.com> Authored: Fri May 9 00:35:13 2014 -0400 Committer: Girish Shilamkar <gir...@clogeny.com> Committed: Fri May 9 00:52:40 2014 -0400 ---------------------------------------------------------------------- test/integration/smoke/test_pvlan.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc0ed93a/test/integration/smoke/test_pvlan.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_pvlan.py b/test/integration/smoke/test_pvlan.py index b435367..a1c146b 100644 --- a/test/integration/smoke/test_pvlan.py +++ b/test/integration/smoke/test_pvlan.py @@ -38,8 +38,12 @@ class TestPVLAN(cloudstackTestCase): vlan = 1234 isolatedpvlan = 567 - def setUp(self): - self.apiClient = self.testClient.getApiClient() + @classmethod + def setUpClass(cls): + cls.testClient = super(TestPVLAN, cls).getClsTestClient() + cls.apiClient = cls.testClient.getApiClient() + cls.zone = get_zone(cls.apiClient, cls.testClient.getZoneForTests()) + cls.zoneId = cls.zone.id @attr(tags = ["advanced", "selfservice"]) def test_create_pvlan_network(self):
