Upstreaming some SecureDrop's test changes #44
Conversation
Config.json, which sets among other things the packages "environment" (prod, staging, dev) was set to prod in all cases. This makes it adequate for each environment.
Work around SecureDrop Workstation issue where focus is stolen from xterm while running `make test`. The root console won't run into GUI / focus strealing problems and has the added advantage of being faster, since commands don't have to be "typed". [1]: freedomofpress/securedrop-workstation#1411
Now done in base test image. Per discussion in QubesOS#25 (comment)
Tests window was loosing focus due to an unkown reason (possibly a test opening a ghost window). This was causing issues where the remainder of the test would fail to run due to xterm no longer being in focus, thus impossible to type in. For context, see freedomofpress/securedrop-workstation#1411
Co-authored-by: deeplow <47065258+deeplow@users.noreply.github.com>
Fix a couple blocking OpenQA issues
This reverts commit 046c6b6. Breaks installation because config.json isn't installed in /usr/share/securedrop-workstation-dom0-config.
Revert "WIP: config.json in dev env was missing"
Sd-whonix will no longer present in the workstation code [1]. [1]: freedomofpress/securedrop-workstation#1415
Remove sd-whonix set up
deeplow
changed the title
| script_run("env CI=true make -C $sdw_path test | tee make-test.log", timeout => 2400); | ||
|
|
||
| # Run tests (xvfb-run needed to simulate screen in root console) | ||
| assert_script_run("xvfb-run env CI=true make -C $sdw_path test | tee make-test.log", timeout => 2400); |
There was a problem hiding this comment.
Maybe it's enough to set DISPLAY=:0 instead? User session is logged in after all, no?
There was a problem hiding this comment.
Good idea. But sadly it doesn't seem have worked: https://openqa.qubes-os.org/tests/155644/logfile?filename=serial_terminal.txt#line-214. With :0.0 it didn't work either.
There was a problem hiding this comment.
Hm, could be some more variables, like XAUTHORITY=/run/lightdm/user/xauthority. It makes Qt apps work for me when started from tty2.
I think it's worth trying to avoid xvfb-run, because two X servers may result in weird errors down the road - for example applications using dbus activation will open on the primary x server (as user's dbus session daemon has DISPLAY=:0), which may confuse some tests at some point.
3 participants
Including a few changes we've done in the mean time. Ready for approval.