81bc3bab
refactor(watcher): use t.Context() and range over int in tests
a73x 2026-04-29 05:56
Commit message
internal/watcher/watcher_test.go
| Old | New | ||
|---|---|---|---|
| @@ -1,7 +1,6 @@ | |||
| 1 | package watcher | 1 | package watcher |
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | "context" | ||
| 5 | "os" | 4 | "os" |
| 6 | "path/filepath" | 5 | "path/filepath" |
| 7 | "testing" | 6 | "testing" |
| @@ -32,9 +31,7 @@ func TestWatcherFiresOnInPlaceWrite(t *testing.T) { | |||
| 32 | } | 31 | } |
| 33 | defer w.Close() | 32 | defer w.Close() |
| 34 | 33 | ||
| 35 | ctx, cancel := context.WithCancel(context.Background()) | 34 | if err := w.Start(t.Context()); err != nil { |
| 36 | defer cancel() | ||
| 37 | if err := w.Start(ctx); err != nil { | ||
| 38 | t.Fatal(err) | 35 | t.Fatal(err) |
| 39 | } | 36 | } |
| 40 | 37 | ||
| @@ -66,9 +63,7 @@ func TestWatcherFiresOnAtomicSave(t *testing.T) { | |||
| 66 | t.Fatal(err) | 63 | t.Fatal(err) |
| 67 | } | 64 | } |
| 68 | defer w.Close() | 65 | defer w.Close() |
| 69 | ctx, cancel := context.WithCancel(context.Background()) | 66 | if err := w.Start(t.Context()); err != nil { |
| 70 | defer cancel() | ||
| 71 | if err := w.Start(ctx); err != nil { | ||
| 72 | t.Fatal(err) | 67 | t.Fatal(err) |
| 73 | } | 68 | } |
| 74 | time.Sleep(20 * time.Millisecond) | 69 | time.Sleep(20 * time.Millisecond) |
| @@ -103,15 +98,13 @@ func TestWatcherDebouncesBurst(t *testing.T) { | |||
| 103 | t.Fatal(err) | 98 | t.Fatal(err) |
| 104 | } | 99 | } |
| 105 | defer w.Close() | 100 | defer w.Close() |
| 106 | ctx, cancel := context.WithCancel(context.Background()) | 101 | if err := w.Start(t.Context()); err != nil { |
| 107 | defer cancel() | ||
| 108 | if err := w.Start(ctx); err != nil { | ||
| 109 | t.Fatal(err) | 102 | t.Fatal(err) |
| 110 | } | 103 | } |
| 111 | time.Sleep(50 * time.Millisecond) | 104 | time.Sleep(50 * time.Millisecond) |
| 112 | 105 | ||
| 113 | // Burst of writes within debounce window | 106 | // Burst of writes within debounce window |
| 114 | for i := 0; i < 5; i++ { | 107 | for i := range 5 { |
| 115 | os.WriteFile(p, []byte{'a' + byte(i)}, 0o644) | 108 | os.WriteFile(p, []byte{'a' + byte(i)}, 0o644) |
| 116 | time.Sleep(20 * time.Millisecond) | 109 | time.Sleep(20 * time.Millisecond) |
| 117 | } | 110 | } |
| @@ -147,9 +140,7 @@ func TestWatcherSkipsIgnoredPaths(t *testing.T) { | |||
| 147 | t.Fatal(err) | 140 | t.Fatal(err) |
| 148 | } | 141 | } |
| 149 | defer w.Close() | 142 | defer w.Close() |
| 150 | ctx, cancel := context.WithCancel(context.Background()) | 143 | if err := w.Start(t.Context()); err != nil { |
| 151 | defer cancel() | ||
| 152 | if err := w.Start(ctx); err != nil { | ||
| 153 | t.Fatal(err) | 144 | t.Fatal(err) |
| 154 | } | 145 | } |
| 155 | time.Sleep(50 * time.Millisecond) | 146 | time.Sleep(50 * time.Millisecond) |