Skip to content

tests: minor adjustments for guix template #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marmarek wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −5
Open

tests: minor adjustments for guix template #814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions qubes/tests/integ/vm_qrexec_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ def test_010_run_xterm(self):
self.assertEqual(self.testvm1.get_power_state(), "Running")

self.loop.run_until_complete(self.wait_for_session(self.testvm1))
p = self.loop.run_until_complete(self.testvm1.run("xterm"))
title = "user@{}".format(self.testvm1.name)
p = self.loop.run_until_complete(
self.testvm1.run(f"xterm -title {title}")
)
try:
title = "user@{}".format(self.testvm1.name)
if self.template.count("whonix"):
title = "user@host"
self.wait_for_window(title)

self.loop.run_until_complete(asyncio.sleep(0.5))
Expand Down Expand Up @@ -123,6 +123,8 @@ def test_011_run_gnome_terminal(self):
self.skipTest("Xfce template doesn't have 'gnome-terminal'")
if "archlinux" in self.template:
self.skipTest("Arch template doesn't have 'gnome-terminal'")
if "guix" in self.template:
self.skipTest("Guix template doesn't have 'gnome-terminal'")
self.loop.run_until_complete(self.testvm1.start())
self.assertEqual(self.testvm1.get_power_state(), "Running")
self.loop.run_until_complete(self.wait_for_session(self.testvm1))
Expand Down Expand Up @@ -373,9 +375,11 @@ def test_115_qrexec_filecopy_no_agent(self):

with self.qrexec_policy("qubes.Filecopy", self.testvm1, self.testvm2):
try:
service_ctl = "herd" if "guix" in self.template else "systemctl"
self.loop.run_until_complete(
self.testvm2.run_for_stdio(
"systemctl stop qubes-qrexec-agent.service", user="root"
f"{service_ctl} stop qubes-qrexec-agent.service",
user="root",
)
)
except subprocess.CalledProcessError:
Expand Down