From 83f2bb5ac70f25f5dab718ff1eac1b0d3d9c10b7 Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Wed, 25 Jun 2014 17:13:47 +0530 Subject: [PATCH] Re-enabling fixed test cases Conflicts: test/integration/smoke/test_scale_vm.py --- test/integration/smoke/test_guest_vlan_range.py | 2 +- test/integration/smoke/test_non_contigiousvlan.py | 2 +- test/integration/smoke/test_scale_vm.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py index 000d71ef01f..12ea52ecde6 100644 --- a/test/integration/smoke/test_guest_vlan_range.py +++ b/test/integration/smoke/test_guest_vlan_range.py @@ -78,7 +78,7 @@ class TestDedicateGuestVlanRange(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags=["advanced", "guestvlanrange", "dedicate", "release"], BugId="CLOUDSTACK-6738", required_hardware="false") + @attr(tags=["advanced", "guestvlanrange", "dedicate", "release"], required_hardware="false") def test_dedicateGuestVlanRange(self): """Test guest vlan range dedication """ diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py index 7469829d23f..e4446180688 100644 --- a/test/integration/smoke/test_non_contigiousvlan.py +++ b/test/integration/smoke/test_non_contigiousvlan.py @@ -38,7 +38,7 @@ class TestUpdatePhysicalNetwork(cloudstackTestCase): raise Exception("Failed to set non contiguous vlan ids to test. Free some ids from \ from existing physical networks at ends") - @attr(tags = ["advanced"], BugId="CLOUDSTACK-6776", required_hardware="false") + @attr(tags = ["advanced"], required_hardware="false") def test_extendPhysicalNetworkVlan(self): """ Test to update a physical network and extend its vlan diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py index cf5f6e5be56..b5c89be4531 100644 --- a/test/integration/smoke/test_scale_vm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -102,6 +102,7 @@ class TestScaleVm(cloudstackTestCase): cleanup_resources(self.apiclient, self.cleanup) return + @attr(hypervisor="xenserver") @attr(tags=["advanced", "basic"], required_hardware="true") def test_01_scale_vm(self): """Test scale virtual machine