Skip to content

marvin: fix test failures when changing service offering of a VM #4651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Feb 5, 2021
Merged

marvin: fix test failures when changing service offering of a VM #4651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions test/integration/smoke/test_service_offerings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,23 @@ def test_04_change_offering_small(self):
self.skipTest("Skipping this test for {} due to bug CS-38153".format(self.hypervisor))
try:
self.medium_virtual_machine.stop(self.apiclient)
timeout = self.services["timeout"]
while True:
time.sleep(self.services["sleep"])
# Ensure that VM is in stopped state
list_vm_response = list_virtual_machines(
self.apiclient,
id=self.medium_virtual_machine.id
)
if isinstance(list_vm_response, list):
vm = list_vm_response[0]
if vm.state == 'Stopped':
self.debug("VM state: %s" % vm.state)
break
if timeout == 0:
raise Exception(
"Failed to stop VM (ID: %s) in change service offering" % vm.id)
timeout = timeout - 1
except Exception as e:
self.fail("Failed to stop VM: %s" % e)

Expand Down
24 changes: 24 additions & 0 deletions test/integration/smoke/test_vm_snapshots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,30 @@ def test_change_service_offering_for_vm_with_snapshots(self):
self.debug("Stopping VM - ID: %s" % virtual_machine.id)
try:
virtual_machine.stop(self.apiclient)
timeout = self.services["timeout"]

while True:
time.sleep(self.services["sleep"])

# Ensure that VM is in stopped state
list_vm_response = list_virtual_machines(
self.apiclient,
id=virtual_machine.id
)

if isinstance(list_vm_response, list):

vm = list_vm_response[0]
if vm.state == 'Stopped':
self.debug("VM state: %s" % vm.state)
break

if timeout == 0:
raise Exception(
"Failed to stop VM (ID: %s) in change service offering" % vm.id)

timeout = timeout - 1

except Exception as e:
self.fail("Failed to stop VM: %s" % e)

Expand Down