summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2020-11-04 11:54:20 -0600
committerGitHub <noreply@github.com>2020-11-04 12:54:20 -0500
commitf42359741a6446d3c4ef25266ec290ed6f925b3a (patch)
tree1223ceb9573bbaae7da0ef4edfab3c4e948c14aa
parentcf6c36a18de233190996f7c2dde1e04908bad50a (diff)
downloadvyos-cloud-init-f42359741a6446d3c4ef25266ec290ed6f925b3a.tar.gz
vyos-cloud-init-f42359741a6446d3c4ef25266ec290ed6f925b3a.zip
Fix launch_kwargs bug in integration tests (#654)
Integration test instance launch would previously fail if provided launch_kwargs is None
-rw-r--r--tests/integration_tests/clouds.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py
index 08c86198..71d4e85d 100644
--- a/tests/integration_tests/clouds.py
+++ b/tests/integration_tests/clouds.py
@@ -59,7 +59,8 @@ class IntegrationCloud(ABC):
'user_data': user_data,
'wait': False,
}
- kwargs.update(launch_kwargs)
+ if launch_kwargs:
+ kwargs.update(launch_kwargs)
log.info(
"Launching instance with launch_kwargs:\n{}".format(
"\n".join("{}={}".format(*item) for item in kwargs.items())