etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Test automation scripts

This commit is contained in:
sailajamada 2015-03-30 09:50:30 +05:30
parent 3c436775d3
commit 5e7baa5a55
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/component/test_browse_volumes.py
View File

@ -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 = [

6
tools/marvin/marvin/config/test_data.py
View File

@ -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":