Separate returns from longer statement blocks

[onechat] / schedule_test.go

diff --git a/schedule_test.go b/schedule_test.go
index f83c2e44d7004ab12c036dc6caa6c993122cecc2..ff7c905fca4b6590cc94c7c36b57e57a49fdef47 100644 (file)
--- a/schedule_test.go
+++ b/schedule_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
        "context"
 
 import (
        "context"

+       "log"

        "os"
        "path/filepath"
        "strings"
        "os"
        "path/filepath"
        "strings"


@@ -128,7 +129,7 @@ func TestSchedulesSurviveARestart(t *testing.T) {
        require.NoError(t, err)
        require.Equal(t, os.FileMode(0o600), info.Mode().Perm())
 
        require.NoError(t, err)
        require.Equal(t, os.FileMode(0o600), info.Mode().Perm())
 

-       reopened, err := openSchedules(path, schedules.clock)
+       reopened, err := openSchedules(path, schedules.clock, discardLog())

        require.NoError(t, err)
        require.Equal(t, "2 | Monday 2026-11-09 08:00 -03:00 | 0 8 * * 1-5 | Tell the user the news.", reopened.List())
 
        require.NoError(t, err)
        require.Equal(t, "2 | Monday 2026-11-09 08:00 -03:00 | 0 8 * * 1-5 | Tell the user the news.", reopened.List())
 


@@ -230,7 +231,7 @@ func TestOpenSchedulesRefusesABadCron(t *testing.T) {
        path := filepath.Join(t.TempDir(), scheduleFileName)
        require.NoError(t, os.WriteFile(path, []byte(`{"next":1,"schedules":[{"id":1,"text":"x","cron":"* * * * *","due":"2026-11-09T09:00:00-03:00"}]}`), 0o600))
 
        path := filepath.Join(t.TempDir(), scheduleFileName)
        require.NoError(t, os.WriteFile(path, []byte(`{"next":1,"schedules":[{"id":1,"text":"x","cron":"* * * * *","due":"2026-11-09T09:00:00-03:00"}]}`), 0o600))
 

-       _, err := openSchedules(path, time.Now)
+       _, err := openSchedules(path, time.Now, discardLog())

        require.ErrorContains(t, err, "schedule 1: the runs of")
 }
 
        require.ErrorContains(t, err, "schedule 1: the runs of")
 }
 


@@ -239,7 +240,8 @@ func TestSchedulesRunStartsATurnWhenDue(t *testing.T) {
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 

-       schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now)
+       logs := &SyncBuffer{}
+       schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now, log.New(logs, "", 0))

        require.NoError(t, err)
 
        server := newModelFake(t)
        require.NoError(t, err)
 
        server := newModelFake(t)


@@ -256,6 +258,7 @@ func TestSchedulesRunStartsATurnWhenDue(t *testing.T) {
        require.Equal(t, "[Schedule 1] Sunday 2026-11-08 20:05 -03:00, once\nRemind the user to drink water.\n"+scheduleEmptyReply, texts[len(texts)-1])
        require.Equal(t, scheduleSource, test.events.LastEvent("work").Source)
        require.Equal(t, "No schedules.", schedules.List())
        require.Equal(t, "[Schedule 1] Sunday 2026-11-08 20:05 -03:00, once\nRemind the user to drink water.\n"+scheduleEmptyReply, texts[len(texts)-1])
        require.Equal(t, scheduleSource, test.events.LastEvent("work").Source)
        require.Equal(t, "No schedules.", schedules.List())

+       require.Equal(t, "schedule 1 ran\n", logs.String())

 }
 
 func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
 }
 
 func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {


@@ -266,7 +269,8 @@ func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
                now: time.Date(2026, time.November, 8, 20, 30, 0, 0, time.FixedZone("", -3*60*60)),
        }
 
                now: time.Date(2026, time.November, 8, 20, 30, 0, 0, time.FixedZone("", -3*60*60)),
        }
 

-       schedules, err := openSchedules(path, clock.Now)
+       logs := &SyncBuffer{}
+       schedules, err := openSchedules(path, clock.Now, log.New(logs, "", 0))

        require.NoError(t, err)
 
        server := newModelFake(t)
        require.NoError(t, err)
 
        server := newModelFake(t)


@@ -280,6 +284,7 @@ func TestSchedulesRunMissedSchedulesOnceAtTheStart(t *testing.T) {
                "[Schedule 2] Sunday 2026-11-08 10:00 -03:00, repeats 0 * * * *\nTell the user the time.\n" + scheduleLateLine + "\n" + scheduleEmptyReply,
        }, texts[len(texts)-2:])
        require.Equal(t, "2 | Sunday 2026-11-08 21:00 -03:00 | 0 * * * * | Tell the user the time.", schedules.List())
                "[Schedule 2] Sunday 2026-11-08 10:00 -03:00, repeats 0 * * * *\nTell the user the time.\n" + scheduleLateLine + "\n" + scheduleEmptyReply,
        }, texts[len(texts)-2:])
        require.Equal(t, "2 | Sunday 2026-11-08 21:00 -03:00 | 0 * * * * | Tell the user the time.", schedules.List())

+       require.Equal(t, "schedule 1 ran 11h30m0s late\nschedule 2 ran 10h30m0s late\n", logs.String())

 }
 
 func TestDaemonRunsADueSchedule(t *testing.T) {
 }
 
 func TestDaemonRunsADueSchedule(t *testing.T) {


@@ -287,7 +292,7 @@ func TestDaemonRunsADueSchedule(t *testing.T) {
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 

-       schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now)
+       schedules, err := openSchedules(filepath.Join(t.TempDir(), scheduleFileName), clock.Now, discardLog())

        require.NoError(t, err)
 
        schedules.check = time.Millisecond
        require.NoError(t, err)
 
        schedules.check = time.Millisecond


@@ -354,7 +359,7 @@ func scheduleTestOpen(t *testing.T) (*Schedules, string) {
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 
                now: time.Date(2026, time.November, 8, 20, 0, 0, 0, time.FixedZone("", -3*60*60)),
        }
 

-       schedules, err := openSchedules(path, clock.Now)
+       schedules, err := openSchedules(path, clock.Now, discardLog())

        require.NoError(t, err)
 
        return schedules, path
        require.NoError(t, err)
 
        return schedules, path