Skip to content

Commit

Permalink
* [e2e] fix fixture bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
lanfon72 committed Aug 10, 2023
1 parent 0f4aca0 commit eceb135
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion harvester_e2e_tests/integration/test_0_storage_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def cluster_network(request, api_client, unique_name):
all_nodes = set(n['id'] for n in data['data'])
try:
# vlad_nic configured on specific cluster network, reuse it
return next(cnet for cnet, nodes in cnet_nodes.items() if all_nodes == set(nodes))
yield next(cnet for cnet, nodes in cnet_nodes.items() if all_nodes == set(nodes))
return None
except StopIteration:
configured_nodes = reduce(add, cnet_nodes.values(), [])
if any(n in configured_nodes for n in all_nodes):
Expand Down
5 changes: 3 additions & 2 deletions harvester_e2e_tests/integration/test_hosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def focal_vm(api_client, focal_image, wait_timeout):
code, data = api_client.vms.get(unique_name)
if 200 == code: # ???: https://github.com/harvester/harvester/issues/4388
volume_name = ""
for volume in data['spec']['volumes']:
for volume in data['spec']['template']['spec']['volumes']:
if volume['name'] == 'disk-0':
volume_name = volume['persistentVolumeClaim']['claimName']
api_client.vms.delete(unique_name)
Expand Down Expand Up @@ -543,7 +543,8 @@ def test_vm_restarted_after_host_reboot(
endtime = datetime.now() + timedelta(seconds=wait_timeout)
while endtime > datetime.now():
code, data = api_client.vms.get_status(focal_vm['name'], focal_vm['namespace'])
if old_uid != data['metadata']['uid'] and "Running" == data['status'].get('phase'):
if (200 == code and old_uid != data['metadata']['uid']
and "Running" == data['status'].get('phase')):
break
sleep(5)
else:
Expand Down

0 comments on commit eceb135

Please sign in to comment.