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/bugs | |
| 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/bugs')
| -rw-r--r-- | tests/integration_tests/bugs/test_gh570.py | 3 | ||||
| -rw-r--r-- | tests/integration_tests/bugs/test_lp1900837.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/integration_tests/bugs/test_gh570.py b/tests/integration_tests/bugs/test_gh570.py index b8866edd..534cfb9a 100644 --- a/tests/integration_tests/bugs/test_gh570.py +++ b/tests/integration_tests/bugs/test_gh570.py @@ -34,5 +34,6 @@ def test_nocloud_seedfrom_vendordata(client: IntegrationInstance): VENDOR_DATA, ) client.execute('cloud-init clean --logs') - client.restart(raise_on_cloudinit_failure=True) + client.restart() + assert client.execute('cloud-init status').ok assert 'seeded_vendordata_test_file' in client.execute('ls /var/tmp') diff --git a/tests/integration_tests/bugs/test_lp1900837.py b/tests/integration_tests/bugs/test_lp1900837.py index 395cace0..fcc2b751 100644 --- a/tests/integration_tests/bugs/test_lp1900837.py +++ b/tests/integration_tests/bugs/test_lp1900837.py @@ -22,7 +22,8 @@ class TestLogPermissionsNotResetOnReboot: assert "600" == _get_log_perms(client) # Reboot - client.restart(raise_on_cloudinit_failure=True) + client.restart() + assert client.execute('cloud-init status').ok # Check that permissions are not reset on reboot assert "600" == _get_log_perms(client) |