tests: more compatibility fixes #1242
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use get_crun_path() from tests_util.py rather than hardcoding "./crun" in the newly introduced (935f4fe) test_oci_features.py test. Signed-off-by: Faidon Liambotis <paravoid@debian.org>
test_uid_tty(), introduced recently with commit 710d8dd, only works (by definition) if a tty exists. Skip if we're not running under a tty, in a similar way to how the test_tty.py tests are being constrained. Signed-off-by: Faidon Liambotis <paravoid@debian.org>
The crun systemd cgroup manager tries to connect to the user manager first, and only falls back to the system manager if that fails (open_sd_bus_connection in src/libcrun/cgroup-systemd.c) Thus the scope is created under user.slice -> user-0.slice -> user@0.service -> app.slice -> crun-test-tmp4_wkotzy.scope. The test tries to validate that CPUWeight was set by running (e.g.): systemctl show crun-test-tmp4_wkotzy.scope This fails, because --system is implied and there is no such scope in the system manager, as the scope was created in the user manager. The correct command in this case would be: systemctl --user show crun-test-tmp4_wkotzy.scope This test failure was not caught up until now because a) the test is skipped if rootless, b) root usually is not logged in into a tty, and a user manager (DBus session) does not exist. However it /can/ happen, and did happen in the Debian autopkgtest environment. Fix this by trying "systemctl show" twice: once against the system manager and once against the user manager. The fix is kinda ugly and repetitive, but abstracting this for two callsites looked even uglier. Closes: containers#1197 Signed-off-by: Faidon Liambotis <paravoid@debian.org>
flouthoc
approved these changes
Jul 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm still pursuing the goal of running the upstream test suite as part of the Debian CI process (as outlined in #1197; also see prior work in #1194 & #1196). Below you'll find a few fixes to bugs I encountered in the process. With this PR everything except one test, sd-notify-proxy[1], runs in both rootful and rootless configurations.
Let me know what you think - thanks!
1: I'm still trying to track that down and I'm already seeing a few things in the test that don't make sense to me. A retroactive review and/or suggestions on what could possibly be going wrong are more than welcome :)