cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [30/50] git commit: updated refs/heads/master to 0b83559
Date Wed, 29 Apr 2015 05:44:14 GMT
Updated Test automation scripts


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

Branch: refs/heads/master
Commit: 5e7baa5a55d0942a630ad78c4ce11a467b40fb8f
Parents: 3c43677
Author: sailajamada <sailaja.mada@citrix.com>
Authored: Mon Mar 30 09:50:30 2015 +0530
Committer: sailajamada <sailaja.mada@citrix.com>
Committed: Mon Mar 30 09:50:30 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_browse_volumes.py | 8 ++++----
 tools/marvin/marvin/config/test_data.py           | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e7baa5a/test/integration/component/test_browse_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_browse_volumes.py b/test/integration/component/test_browse_volumes.py
index ddc8517..9067e2f 100644
--- a/test/integration/component/test_browse_volumes.py
+++ b/test/integration/component/test_browse_volumes.py
@@ -82,9 +82,9 @@ class TestBrowseUploadVolume(cloudstackTestCase):
                  else:
                      break
 
-        cls.uploadurl=cls.testdata["browser_upload_volume"][cls.uploadvolumeformat]["url"]
-        cls.volname=cls.testdata["browser_upload_volume"][cls.uploadvolumeformat]["diskname"]
-        cls.md5sum=cls.testdata["browser_upload_volume"][cls.uploadvolumeformat]["checksum"]
+        cls.uploadurl=cls.testdata["configurableData"]["browser_upload_volume"][cls.uploadvolumeformat]["url"]
+        cls.volname=cls.testdata["configurableData"]["browser_upload_volume"][cls.uploadvolumeformat]["diskname"]
+        cls.md5sum=cls.testdata["configurableData"]["browser_upload_volume"][cls.uploadvolumeformat]["checksum"]
         cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
         cls.domain = get_domain(cls.apiclient)
         cls.pod = get_pod(cls.apiclient, cls.zone.id)
@@ -108,7 +108,7 @@ class TestBrowseUploadVolume(cloudstackTestCase):
         )
         cls.disk_offering = DiskOffering.create(
             cls.apiclient,
-            cls.testdata["browser_upload_volume"]["browser_resized_disk_offering"],
+            cls.testdata["configurableData"]["browser_upload_volume"]["browser_resized_disk_offering"],
             custom=True
         )
         cls._cleanup = [

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e7baa5a/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index c1156c4..9c12a0f 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1537,7 +1537,7 @@ test_data = {
         "url": "http://10.147.28.7/templates/builtin/centos56-x86_64.vhd.bz2",
         "hypervisor":"XenServer",
         "checksum": "09b08b6abb1b903fca7711d3ac8d6598",
-        "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
+        "ostypeid":"fbe5230a-d490-11e4-a923-2611fa84f51d"
                 },
           "OVA": {
         "templatename": "VMwareUploadtemplate",
@@ -1551,9 +1551,9 @@ test_data = {
         "templatename": "KVMUploadtemplate",
         "displaytext": "VMwareUploadtemplate",
         "url": "http://10.147.28.7/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
-        "checksum": "da997b697feaa2f1f6e0d4785b0cece2",
+        "checksum": "d06b5f6a-d44e-11e4-9d99-4af3a393b3ac",
         "hypervisor":"KVM",
-        "ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef"
+        "ostypeid":"d084e2c8-d44e-11e4-9d99-4af3a393b3ac"
                 },
                               },
         "bootableIso":


Mime
View raw message