diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-12-17 12:32:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 12:32:06 -0500 |
| commit | 0b932e55aa32e417b3ad5f2101acf6964108f0e0 (patch) | |
| tree | fad3c2fded818fe4d9c62332346f048c54c14f88 /tests/integration_tests | |
| parent | a5484d02973e5710442c11e1dc6b1153695c9a59 (diff) | |
| download | vyos-cloud-init-0b932e55aa32e417b3ad5f2101acf6964108f0e0.tar.gz vyos-cloud-init-0b932e55aa32e417b3ad5f2101acf6964108f0e0.zip | |
integration_tests: fix IN_PLACE CLOUD_INIT_SOURCE (#731)
This fixes up an issue introduced in
54e202a6480e48dbb8a72004f7a5003f7c4edfae.
Diffstat (limited to 'tests/integration_tests')
| -rw-r--r-- | tests/integration_tests/conftest.py | 3 | ||||
| -rw-r--r-- | tests/integration_tests/test_upgrade.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py index 50b300c4..2d12045c 100644 --- a/tests/integration_tests/conftest.py +++ b/tests/integration_tests/conftest.py @@ -108,6 +108,7 @@ def session_cloud(): def get_validated_source( + session_cloud: IntegrationCloud, source=integration_settings.CLOUD_INIT_SOURCE ) -> CloudInitSource: if source == 'NONE': @@ -134,7 +135,7 @@ def setup_image(session_cloud: IntegrationCloud): So we can launch instances / run tests with the correct image """ - source = get_validated_source() + source = get_validated_source(session_cloud) if not source.installs_new_version(): return log.info('Setting up environment for %s', session_cloud.datasource) diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py index 76ad055b..a115bea7 100644 --- a/tests/integration_tests/test_upgrade.py +++ b/tests/integration_tests/test_upgrade.py @@ -56,7 +56,7 @@ def _restart(instance): @pytest.mark.sru_2020_11 def test_upgrade(session_cloud: IntegrationCloud): - source = get_validated_source() + source = get_validated_source(session_cloud) if not source.installs_new_version(): pytest.skip("Install method '{}' not supported for this test".format( source |