Skip to content

Commit a366ece

Browse files
jfrochepicnoir
authored andcommitted
test: update existing-files for timers.target substitution
Timers now wantedBy system-manager.target instead of timers.target, so verify the symlink is created there and the pre-existing timers.target.wants entry is left untouched.
1 parent 8d5c3f1 commit a366ece

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

testFlake/container-tests/existing-files.nix

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# with backup on systems where those entries already exist.
44
{
55
forEachDistro,
6-
system-manager,
76
...
87
}:
98

@@ -82,10 +81,12 @@ forEachDistro "existing-files" {
8281
backup_symlink = machine.succeed("cat /etc/force-symlink-test.system-manager-backup").strip()
8382
assert backup_symlink == "original symlink content", f"Expected original symlink backup, got: {backup_symlink}"
8483
85-
# Verify .wants symlink was replaced (auto-backup for systemd dependency dirs)
86-
machine.succeed("test -L /etc/systemd/system/timers.target.wants/existing.timer")
87-
backup_wants = machine.succeed("readlink /etc/systemd/system/timers.target.wants/existing.timer.system-manager-backup").strip()
88-
assert "fake-existing.timer" in backup_wants, f"Expected backup of original .wants symlink, got: {backup_wants}"
84+
# Verify the timer is pulled in via system-manager.target
85+
machine.succeed("test -L /etc/systemd/system/system-manager.target.wants/existing.timer")
86+
87+
# Verify the pre-existing timers.target.wants symlink is left untouched
88+
existing_wants = machine.succeed("readlink /etc/systemd/system/timers.target.wants/existing.timer").strip()
89+
assert "fake-existing.timer" in existing_wants, f"Expected pre-existing .wants symlink untouched, got: {existing_wants}"
8990
9091
# Verify the timer unit content matches the declared config
9192
timer_content = machine.succeed("cat /etc/systemd/system/existing.timer")
@@ -105,9 +106,9 @@ forEachDistro "existing-files" {
105106
assert restored_symlink == "original symlink content", f"Expected restored original, got: {restored_symlink}"
106107
machine.fail("test -e /etc/force-symlink-test.system-manager-backup")
107108
109+
# Pre-existing timers.target.wants symlink should still be present (never touched)
108110
restored_wants = machine.succeed("readlink /etc/systemd/system/timers.target.wants/existing.timer").strip()
109-
assert "fake-existing.timer" in restored_wants, f"Expected restored .wants symlink, got: {restored_wants}"
110-
machine.fail("test -e /etc/systemd/system/timers.target.wants/existing.timer.system-manager-backup")
111+
assert "fake-existing.timer" in restored_wants, f"Expected pre-existing .wants symlink, got: {restored_wants}"
111112
112113
# Verify no-replace-test was never touched
113114
no_replace_after = machine.succeed("cat /etc/no-replace-test").strip()

0 commit comments

Comments
 (0)