diff options
| author | James Falcon <TheRealFalcon@users.noreply.github.com> | 2021-01-26 11:25:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 12:25:04 -0500 |
| commit | a9c904dc6438c908cd5341312311dfbbb18c81d2 (patch) | |
| tree | 6d15e0b32a4a7f7160811225b1449ab4782cbb28 /tests/integration_tests/test_upgrade.py | |
| parent | 1527efa740ce7e66d9506ea62b0b8010d71a4104 (diff) | |
| download | vyos-cloud-init-a9c904dc6438c908cd5341312311dfbbb18c81d2.tar.gz vyos-cloud-init-a9c904dc6438c908cd5341312311dfbbb18c81d2.zip | |
Remove 'remove-raise-on-failure' calls from integration_tests (#788)
pycloudlib no longer raises exceptions when cloud-init fails to start,
and the API has been updated accordingly. Changes have been made to
integration tests accordingly
Diffstat (limited to 'tests/integration_tests/test_upgrade.py')
| -rw-r--r-- | tests/integration_tests/test_upgrade.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py index 660d363f..233a574b 100644 --- a/tests/integration_tests/test_upgrade.py +++ b/tests/integration_tests/test_upgrade.py @@ -43,15 +43,14 @@ def _output_to_compare(instance, file_path, netcfg_path): def _restart(instance): # work around pad.lv/1908287 - try: - instance.restart(raise_on_cloudinit_failure=True) - except OSError as e: + instance.restart() + if not instance.execute('cloud-init status --wait --long').ok: for _ in range(10): time.sleep(5) result = instance.execute('cloud-init status --wait --long') if result.ok: return - raise e + raise Exception("Cloud-init didn't finish starting up") @pytest.mark.sru_2020_11 |