cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/master to 83f2bb5
Date Wed, 25 Jun 2014 12:32:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master c468228fe -> 83f2bb5ac


Re-enabling fixed test cases

Conflicts:

	test/integration/smoke/test_scale_vm.py


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83f2bb5a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83f2bb5a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83f2bb5a

Branch: refs/heads/master
Commit: 83f2bb5ac70f25f5dab718ff1eac1b0d3d9c10b7
Parents: c468228
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Wed Jun 25 17:13:47 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Jun 25 18:02:04 2014 +0530

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83f2bb5a/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index 000d71e..12ea52e 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
         """

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83f2bb5a/test/integration/smoke/test_non_contigiousvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
index 7469829..e444618 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83f2bb5a/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index cf5f6e5..b5c89be 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 


Mime
View raw message