Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sssd_test_framework/misc/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

test_venv = "/opt/test_venv"
test_venv_bin = f"{test_venv}/bin"
scauto_path = f"{test_venv_bin}/scauto"
8 changes: 4 additions & 4 deletions sssd_test_framework/utils/gdm.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

from pytest_mh import MultihostHost, MultihostUtility

from ..misc.globals import scauto_path

if TYPE_CHECKING:
from ..roles.client import Client

Expand All @@ -27,7 +29,7 @@ def __init__(self, host):
super().__init__(host)
self.init_completed = False

self.cmd = ["/opt/test_venv/bin/scauto", "gui", "--wait-time", "1", "--no-screenshot"]
self.cmd = [scauto_path, "gui", "--wait-time", "1", "--no-screenshot"]

def teardown(self):
if self.init_completed:
Expand Down Expand Up @@ -126,7 +128,7 @@ def check_home_screen(self) -> bool:
if not self.init_completed:
self.init()

cmd = ["/opt/test_venv/bin/scauto", "-v", "debug", "gui", "--wait-time", "5", "--no-screenshot"]
cmd = [scauto_path, "-v", "debug", "gui", "--wait-time", "2", "--no-screenshot"]
result = self.host.conn.exec([*cmd, "check-home-screen"], raise_on_error=False)
return result.rc == 0

Expand Down Expand Up @@ -163,8 +165,6 @@ def login_idp(self, client: Client, username: str, password: str) -> bool:
client.journald.clear()

self.click_on("listed?")
self.kb_send("tab")
self.click_on("Username")
self.kb_write(username)
self.click_on("Log")

Expand Down
6 changes: 5 additions & 1 deletion sssd_test_framework/utils/sssctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,11 @@ def vfido_passkey_register(
raise_on_error=True,
)

return result.stdout_lines[-2].strip()
self.logger.info(f"EXPECT STDOUT: {result.stdout}")
for line in result.stdout_lines:
if line.startswith("passkey:"):
return line.strip()
raise ValueError("passkey mapping entry not returned by registration")

def umockdev_passkey_register(
self,
Expand Down