Skip to content

fix(e2e): expect operator job triggers #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishr merged 1 commit into from
Sep 16, 2026
+6 −6
Merged

fix(e2e): expect operator job triggers #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions e2e/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ ExecStart=/usr/bin/docker compose -p observer -f /var/lib/ob/observer/current/co
}

// The notifier wrote a record for that run; a hand-started unit has no
// TRIGGER_UNIT, so it is recorded as a operator activation.
// TRIGGER_UNIT, so it is recorded as an operator activation.
history := s.mustOb(t, dir, "job", "history", "chore", "--output", "json")
for _, want := range []string{`"outcome": "success"`, `"trigger": "manual"`, `"attempts": 1`} {
for _, want := range []string{`"outcome": "success"`, `"trigger": "operator"`, `"attempts": 1`} {
if !strings.Contains(history, want) {
t.Fatalf("run history is missing %q:\n%s", want, history)
}
Expand All @@ -255,10 +255,10 @@ ExecStart=/usr/bin/docker compose -p observer -f /var/lib/ob/observer/current/co
}
}

// A operator run with an input override reaches the container as its
// An operator run with an input override reaches the container as its
// environment, is journaled with the operator, and shows up as such.
manual := s.mustOb(t, dir, "job", "run", "input-chore", "--input", "GREETING=hello", "--wait", "--output", "json")
for _, want := range []string{`"GREETING": "hello"`, `"outcome": "success"`, `"trigger": "manual"`} {
for _, want := range []string{`"GREETING": "hello"`, `"outcome": "success"`, `"trigger": "operator"`} {
if !strings.Contains(manual, want) {
t.Fatalf("operator run result is missing %q:\n%s", want, manual)
}
Expand Down Expand Up @@ -332,7 +332,7 @@ HTTPServer(("127.0.0.1", 18080), Handler).handle_request()
}
// The record is the verdict, so `systemctl reset-failed` no longer
// clears the failure from `ob status`; only a later successful run
// does. A operator run with the input that makes the job finish in time
// does. An operator run with the input that makes the job finish in time
// is that run, and it must leave status green for the steps after.
s.mustOb(t, dir, "job", "run", "timeout-chore", "--input", "SLEEP=0", "--wait")
if cleared := s.mustOb(t, dir, "status"); !strings.Contains(cleared, "schedule timeout-chore active") {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/schedule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,7 +1635,7 @@ func TestScheduleInputsLinesParseTheFileIntoArguments(t *testing.T) {
}
}
if _, err := os.Stat(inputs); err == nil {
t.Fatal("the inputs file survived a operator activation")
t.Fatal("the inputs file survived an operator activation")
}
if err := os.WriteFile(inputs, []byte(body), 0o600); err != nil {
t.Fatal(err)
Expand Down