fix: update unpriv client

Author: rnetser

tests/conftest.py

@@ -253,25 +253,29 @@ def unprivileged_client(
 
     else:
         current_user = run_command(command=["oc", "whoami"])[1].strip()
+        non_admin_user_name = non_admin_user_password[0]
 
         if login_with_user_password(
             api_address=admin_client.configuration.host,
-            user=non_admin_user_password[0],
+            user=non_admin_user_name,
             password=non_admin_user_password[1],
         ):
             with open(kubconfig_filepath) as fd:
                 kubeconfig_content = yaml.safe_load(fd)
 
             unprivileged_context = kubeconfig_content["current-context"]
 
+            unprivileged_client = get_client(config_file=kubconfig_filepath, context=unprivileged_context)
+
             # Get back to admin account
             login_with_user_password(
                 api_address=admin_client.configuration.host,
                 user=current_user.strip(),
             )
-            yield get_client(config_file=kubconfig_filepath, context=unprivileged_context)
+            yield unprivileged_client
 
         else:
+            LOGGER.error(f"Failed to log in as user {non_admin_user_name}; logging in as admin user.")
             yield admin_client
 
 

utilities/infra.py

@@ -330,7 +330,10 @@ def login_with_user_password(api_address: str, user: str, password: str | None =
 
     _, out, _ = run_command(command=shlex.split(login_command), hide_log_command=True)
 
-    return "Login successful" in out
+    if re.search(r"Login successful|Logged into", out):
+        return True
+
+    return False
 
 
 @cache