Merge pull request #1867 from dzhengfy/minor_fix_dict_keyerror

test_setup: Fix dict keyerror
avocado-framework · Dec 10, 2018 · fb81491 · fb81491
2 parents 3812d8a + 6d3f705
commit fb81491
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/virttest/test_setup.py b/virttest/test_setup.py
@@ -2228,9 +2228,9 @@ def remote_session(params):
     :param params: Test params dict for remote machine login details
     :return: remote session object
     """
-    server_ip = params.get("server_ip", params["remote_ip"])
-    server_user = params.get("server_user", params["remote_user"])
-    server_pwd = params.get("server_pwd", params["remote_pwd"])
+    server_ip = params.get("server_ip", params.get("remote_ip"))
+    server_user = params.get("server_user", params.get("remote_user"))
+    server_pwd = params.get("server_pwd", params.get("remote_pwd"))
     return remote.wait_for_login('ssh', server_ip, '22', server_user,
                                  server_pwd, r"[\#\$]\s*$")