cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 2869744
Date Fri, 14 Mar 2014 06:05:53 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 16ddc3414 -> 286974488


CLOUDSTACK-6215: Updating test case to accomodate condition for VMware

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/master
Commit: 286974488eab03efddfea35962161a224e997ab0
Parents: 16ddc34
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Mon Mar 10 03:44:43 2014 -0400
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Mar 14 11:34:52 2014 +0530

----------------------------------------------------------------------
 .../component/test_base_image_updation.py        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28697448/test/integration/component/test_base_image_updation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index af968cc..e31aacf 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -25,11 +25,10 @@
 """
 
 #Import Local Modules
-import marvin
 from marvin.codes import (PASS,
                           RECURRING)
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
 
 from marvin.integration.lib.base import (ServiceOffering,
                                          Account,
@@ -51,7 +50,6 @@ from marvin.integration.lib.utils import (validateList,
                                           cleanup_resources)
 
 import time
-from datetime import datetime, timedelta
 
 class Services:
     """Test Base Image Updation
@@ -117,6 +115,18 @@ class Services:
                         "ispublic": True,
                         "isextractable": True,
 
+                },
+                "VMware": {
+                        "displaytext": "Public Template - VMware",
+                        "name": "Public template -VMware",
+                        "ostype": "CentOS 5.3 (64-bit)",
+                        "url": "http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova",
+                        "hypervisor": "vmware",
+                        "format": "ova",
+                        "isfeatured": True,
+                        "ispublic": True,
+                        "isextractable": True,
+
                 }
             },
             "template": {
@@ -503,8 +513,7 @@ class TestBaseImageUpdate(cloudstackTestCase):
                                     "VM created with IsVolatile=False doesn't have same ip
after restore. Got : %s Expected : %s"
                                     %(vm_without_reset.nic[0].ipaddress, self.vm_without_reset.nic[0].ipaddress)
                                 )
-
-	    return
+        return
 
     @attr(tags=["advanced", "basic"])
     def test_04_reoccuring_snapshot_rules(self):


Mime
View raw message