apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Modified further based on Travis failures

Browse Source
This commit is contained in:
shweta 2017-05-05 14:04:35 +05:30
parent 7d80c1b349
commit d5d1bd9fc7
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/component/test_project_usage.py
View File

@ -350,7 +350,7 @@ class TestVmUsage(cloudstackTestCase):
self.assertEqual( self.assertEqual(
qresult.count('VOLUME.DELETE'), qresult.count('VOLUME.DELETE'),
2, 1,
"Check VOLUME.DELETE in events table" "Check VOLUME.DELETE in events table"
) )
return return

9
test/integration/component/test_usage.py
View File

@ -574,9 +574,8 @@ class TestVolumeUsage(cloudstackTestCase):
"basic", "basic",
"sg", "sg",
"eip", "eip",
"advancedns", "advancedns"],
"simulator"], required_hardware="true")
required_hardware="false")
def test_01_volume_usage(self): def test_01_volume_usage(self):
"""Test Create/delete a volume and verify correct usage is recorded """Test Create/delete a volume and verify correct usage is recorded
""" """
@ -697,10 +696,6 @@ class TestVolumeUsage(cloudstackTestCase):
self.testdata["coreos_volume"][ self.testdata["coreos_volume"][
"url"] = self.testdata["coreos_volume"]["urlxen"] "url"] = self.testdata["coreos_volume"]["urlxen"]
self.testdata["coreos_volume"]["format"] = "VHD" self.testdata["coreos_volume"]["format"] = "VHD"
elif self.hypervisor == "simulator":
self.testdata["coreos_volume"][
"url"] = self.testdata["coreos_volume"]["urlxen"]
self.testdata["coreos_volume"]["format"] = "VHD"
volume_uploaded = Volume.upload( volume_uploaded = Volume.upload(
self.apiclient, self.apiclient,