From f42359741a6446d3c4ef25266ec290ed6f925b3a Mon Sep 17 00:00:00 2001
From: James Falcon <TheRealFalcon@users.noreply.github.com>
Date: Wed, 4 Nov 2020 11:54:20 -0600
Subject: Fix launch_kwargs bug in integration tests (#654)

Integration test instance launch would previously fail if provided
launch_kwargs is None
---
 tests/integration_tests/clouds.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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())
-- 
cgit v1.2.3