[45/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 30e2971

[ts...@apache.org]

scalevm test: adjust the tags to suit the environment

scalevm works with the xenserver hypervisortype only.

Signed-off-by: Prasanna Santhanam <ts...@apache.org>


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

Branch: refs/heads/marvin_refactor
Commit: 4ae3e5de7f98147abf6f72f7b102c56125071035
Parents: 580731c
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Apr 12 16:31:34 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Apr 12 16:32:12 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_ScaleVm.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ae3e5de/test/integration/smoke/test_ScaleVm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ScaleVm.py b/test/integration/smoke/test_ScaleVm.py
index 710d2ad..64fe4dc 100644
--- a/test/integration/smoke/test_ScaleVm.py
+++ b/test/integration/smoke/test_ScaleVm.py
@@ -91,7 +91,7 @@ class Services:
             "sleep": 60,
             "timeout": 10,
             #Migrate VM to hostid
-            "ostype": 'CentOS 5.6 (64-bit)',
+            "ostype": 'CentOS 5.3 (64-bit)',
             # CentOS 5.3 (64-bit)
         }
 
@@ -164,7 +164,7 @@ class TestScaleVm(cloudstackTestCase):
         cleanup_resources(self.apiclient, self.cleanup)
         return
 
-    @attr(tags = ["advanced", "basic", "multicluster", "storagemotion", "xenserver"])
+    @attr(tags = ["xenserver", "advanced", "basic"])
     def test_01_scale_vm(self):
         """Test scale virtual machine 
         """