diff --git a/modules/pacman/cmd/pacman-tools/stale_run_test.go b/modules/pacman/cmd/pacman-tools/stale_run_test.go index 39d9ecdf..0c9d9e7d 100644 --- a/modules/pacman/cmd/pacman-tools/stale_run_test.go +++ b/modules/pacman/cmd/pacman-tools/stale_run_test.go @@ -1,7 +1,7 @@ package main // A run read from pacman's log, or a run whose transaction ended, never holds a new run back (issue 1841, the -// refusal of 2026-10-22 22:00 on novox: "run 20220123T194900Z is still going (its last step is finished): one +// refusal of 2026-10-22 22:00 on the control-node: "run 20220123T194900Z is still going (its last step is finished): one // run at a time"); and pacman_upgrades reads one run whole at an address that names the machine. import ( @@ -10,11 +10,11 @@ import ( "time" ) -// novoxLogHead is the first twelve lines of novox's /var/log/pacman.log, captured 2026-10-22 22:10 with -// node-reads.read: the install's `pacman -Syu` with nothing to do, which became run 20220123T194900Z, its -// last step finished at the moment it began (pacman_upgrades on novox, 2026-10-22: from log, outcome -// finished, began 2022-01-23T19:49:00Z, ended 2022-01-23T20:49:00+01:00). -const novoxLogHead = "[2022-01-23T20:49:00+0100] [PACMAN] Running 'pacman -Syu'\n" + +// installLogHead is the first twelve lines of the control-node's /var/log/pacman.log, captured 2026-10-22 22:10 +// with node-reads.read: the install's `pacman -Syu` with nothing to do, which became run 20220123T194900Z, its +// last step finished at the moment it began (pacman_upgrades there, 2026-10-22: from log, outcome finished, +// began 2022-01-23T19:49:00Z, ended 2022-01-23T20:49:00+01:00). +const installLogHead = "[2022-01-23T20:49:00+0100] [PACMAN] Running 'pacman -Syu'\n" + "[2022-01-23T20:49:00+0100] [PACMAN] synchronizing package lists\n" + "[2022-01-23T20:49:00+0100] [PACMAN] starting full system upgrade\n" + "[2022-01-23T20:50:45+0100] [PACMAN] Running 'pacman -S nano'\n" + @@ -27,12 +27,12 @@ const novoxLogHead = "[2022-01-23T20:49:00+0100] [PACMAN] Running 'pacman -Syu'\ "[2022-01-23T20:55:36+0100] [ALPM] installed bridge-utils (1.7.1-1)\n" + "[2022-01-23T20:55:36+0100] [ALPM] installed libtool (2.4.6+42+gb88cebd5-16)\n" -// 1841/AC20: given the run read from novox's log, when an upgrade is asked, then it starts. +// 1841/AC20: given the run read from the control-node's log, when an upgrade is asked, then it starts. func TestARunReadFromTheLogIsHistoryAndNeverHoldsAnAsk(t *testing.T) { k := newKeeperBed(t) - past := PastUpgrades("node-a", novoxLogHead) + past := PastUpgrades("node-a", installLogHead) if len(past) != 1 || past[0].Run != "20220123T194900Z" || steps(past[0]) != "started finished" || past[0].From != FromLog { - t.Fatalf("the captured log reads as the record novox holds: %+v", past) + t.Fatalf("the captured log reads as the record the control-node holds: %+v", past) } if _, err := k.runs.Create(NodeKey("node-a", past[0].Run), past[0]); err != nil { t.Fatal(err) @@ -89,7 +89,7 @@ func TestARunWhoseTransactionEndedNeverHoldsTheNext(t *testing.T) { // pacman_upgrades is asked for one run, then that machine's run is answered whole. func TestPacmanUpgradesReadsOneRunOfThisNodeWithoutANode(t *testing.T) { runs := newBucket() - past := PastUpgrades("node-a", novoxLogHead)[0] + past := PastUpgrades("node-a", installLogHead)[0] if _, err := runs.Create(NodeKey("node-a", past.Run), past); err != nil { t.Fatal(err) }