Skip to content

Commit

Permalink
support/testing: TestPolkitSystemd: fix systemctl exit code check on …
Browse files Browse the repository at this point in the history
…failure

As reported by [1] [2], the return code of systemctl command between
systemd 253 and 254 has changed when the polkit authentication is
refused:

/bin/systemctl restart systemd-timesyncd.service

The return code changed from 1 to 4. The Polkit test case
"TestPolkitSystemd" expected 1 as return code [3].

The service log is not the same either:

systemd v253:
Failed to restart systemd-timesyncd.service: Interactive authentication required.

systemd v254:
Failed to restart systemd-timesyncd.service: Access denied

git bisect report this commit:
systemd/systemd@959301c

From the PR (to get more context):
systemd/systemd#26365

Note: systemd doesn't recommend using systemctl exit code to check unit states:
"The mapping of LSB service states to systemd unit states is imperfect, so it is better to
not rely on those return values but to look for specific unit states and substates instead."

Since we only want to check if the command failed, update our test to
check if systemctl returned a non zero code whatever the reason of the
failure.

Thanks to Yann E. MORIN for the brainstorming!

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/4768561464 (TestPolkitSystemd)

[1] http://lists.busybox.net/pipermail/buildroot/2023-August/671900.html
[2] https://lists.freedesktop.org/archives/systemd-devel/2023-August/049362.html
[3] https://git.buildroot.net/buildroot/tree/support/testing/tests/package/test_polkit.py?h=2023.08-rc1#n45
[4] https://github.com/systemd/systemd/blob/v254/man/systemctl.xml#L2612

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  • Loading branch information
RomainNaour authored and user131 committed Sep 18, 2023
1 parent 9fe04a5 commit 9d6d893
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion support/testing/tests/package/test_polkit.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_run(self):
for rule_path in TestPolkitInfra.rule_paths:
cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'"
_, exit_code = self.emulator.run(cmd, 10)
self.assertEqual(exit_code, 1)
self.assertNotEqual(exit_code, 0)

cmd = "cp /root/{file} {path}".format(file=rule_file, path=rule_path)
_, exit_code = self.emulator.run(cmd, 10)
Expand Down

0 comments on commit 9d6d893

Please sign in to comment.