From eceb1354692cd6cf5a949686bb85389feb95e953 Mon Sep 17 00:00:00 2001 From: Lanfon Fan Date: Wed, 9 Aug 2023 18:29:15 +0800 Subject: [PATCH] * [e2e] fix fixture bugs --- harvester_e2e_tests/integration/test_0_storage_network.py | 3 ++- harvester_e2e_tests/integration/test_hosts.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/harvester_e2e_tests/integration/test_0_storage_network.py b/harvester_e2e_tests/integration/test_0_storage_network.py index 03ebf5e17..c72cea1c7 100644 --- a/harvester_e2e_tests/integration/test_0_storage_network.py +++ b/harvester_e2e_tests/integration/test_0_storage_network.py @@ -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): diff --git a/harvester_e2e_tests/integration/test_hosts.py b/harvester_e2e_tests/integration/test_hosts.py index e7ec631ca..75cf14862 100644 --- a/harvester_e2e_tests/integration/test_hosts.py +++ b/harvester_e2e_tests/integration/test_hosts.py @@ -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) @@ -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: