diff options
Diffstat (limited to 'pkg/coveragedb/coveragedb_mock_test.go')
| -rw-r--r-- | pkg/coveragedb/coveragedb_mock_test.go | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkg/coveragedb/coveragedb_mock_test.go b/pkg/coveragedb/coveragedb_mock_test.go index 23676d31f..f7efd479a 100644 --- a/pkg/coveragedb/coveragedb_mock_test.go +++ b/pkg/coveragedb/coveragedb_mock_test.go @@ -4,7 +4,6 @@ package coveragedb import ( - "context" "encoding/json" "io" "strings" @@ -13,7 +12,6 @@ import ( "cloud.google.com/go/spanner" "github.com/google/syzkaller/pkg/coveragedb/mocks" - "github.com/google/syzkaller/pkg/subsystem" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) @@ -23,7 +21,6 @@ type spannerMockTune func(*testing.T, *mocks.SpannerClient) func TestSaveMergeResult(t *testing.T) { tests := []struct { name string - sss []*subsystem.Subsystem jsonl io.Reader descr *HistoryRecord mockTune spannerMockTune @@ -45,7 +42,7 @@ func TestSaveMergeResult(t *testing.T) { name: "1 MCR record, Ok", jsonl: strings.NewReader(`{"MCR":{"FileData":{}}}`), descr: &HistoryRecord{}, - wantRows: 3, // 1 in files, 1 in file_subsystems and 1 in merge_history + wantRows: 2, // 1 in files and 1 in merge_history mockTune: func(t *testing.T, m *mocks.SpannerClient) { m. On("Apply", mock.Anything, mock.Anything). @@ -71,14 +68,14 @@ func TestSaveMergeResult(t *testing.T) { jsonl: strings.NewReader(` {"MCR":{"FileData":{}}} {"MCR":{"FileData":{}}}`), descr: &HistoryRecord{}, - wantRows: 5, + wantRows: 3, mockTune: func(t *testing.T, m *mocks.SpannerClient) { m. On("Apply", mock.Anything, mock.MatchedBy(func(ms []*spanner.Mutation) bool { - // 2 in files, 2 in file_subsystems and 1 in merge_history - return len(ms) == 5 + // 2 in files and 1 in merge_history + return len(ms) == 3 })). Return(time.Now(), nil). Once() @@ -88,17 +85,17 @@ func TestSaveMergeResult(t *testing.T) { name: "2k records, Ok", jsonl: strings.NewReader(strings.Repeat("{\"MCR\":{\"FileData\":{}}}\n", 2000)), descr: &HistoryRecord{}, - wantRows: 4001, + wantRows: 2001, mockTune: func(t *testing.T, m *mocks.SpannerClient) { m. On("Apply", mock.Anything, mock.MatchedBy(func(ms []*spanner.Mutation) bool { - // 2k in files, 2k in file_subsystems + // 2k in files return len(ms) == 1000 })). Return(time.Now(), nil). - Times(4). + Times(2). On("Apply", mock.Anything, mock.MatchedBy(func(ms []*spanner.Mutation) bool { @@ -117,11 +114,7 @@ func TestSaveMergeResult(t *testing.T) { if test.mockTune != nil { test.mockTune(t, spannerMock) } - gotRows, err := SaveMergeResult( - context.Background(), - spannerMock, - test.descr, - json.NewDecoder(test.jsonl), test.sss) + gotRows, err := SaveMergeResult(t.Context(), spannerMock, test.descr, json.NewDecoder(test.jsonl)) if test.wantErr { assert.Error(t, err) } else { |