Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions script.go
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ func WatchCmd(db *DB) script.Cmd {
if err != nil {
return nil, err
}
defer iter.Close()

header := tbl.TableHeader()
if header == nil {
Expand Down
25 changes: 25 additions & 0 deletions script_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"slices"
"strings"
"testing"
"time"

"github.com/cilium/hive"
"github.com/cilium/hive/cell"
Expand Down Expand Up @@ -48,6 +49,30 @@ func TestScript(t *testing.T) {
)
}

func TestWatchCmdClosesChangeIterator(t *testing.T) {
db, table, metrics := newTestDB(t)

ctx, cancel := context.WithCancel(t.Context())
state, err := script.NewState(ctx, t.TempDir(), nil)
require.NoError(t, err)
engine := script.Engine{
Cmds: map[string]script.Cmd{"db/watch": WatchCmd(db)},
}

done := make(chan error, 1)
go func() {
done <- engine.ExecuteLine(state, "db/watch test", &strings.Builder{})
}()

require.Eventually(t, func() bool {
return expvarInt(metrics.DeleteTrackerCountVar.Get(table.Name())) == 1
}, time.Second, time.Millisecond)

cancel()
require.NoError(t, <-done)
require.EqualValues(t, 0, expvarInt(metrics.DeleteTrackerCountVar.Get(table.Name())))
}

func TestHeaderLine(t *testing.T) {
type retrieval struct {
header string
Expand Down
Loading