public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Bump golangci-lint to 2.0.2 (#103572)

Browse Source
This commit is contained in:
Mariell Hoversholm
2025-04-10 14:42:23 +02:00
committed by GitHub
parent b58b6e828e
commit 757be6365a
291 changed files with 1948 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/dbutil/dbutil_test.go
+5 -5
View File
@@ -69,7 +69,7 @@ func newReturnsRow[T any](dbmock sqlmock.Sqlmock, req *sqltemplateMocks.WithResu
func (r *expectRows[T]) Add(value T, err error) *expectRows[T] {
r.req.EXPECT().GetScanDest().Return(nil).Once()
r.req.EXPECT().Results().Return(value, err).Once()
r.Rows.AddRow()
r.AddRow()
r.ExpectedResults = append(r.ExpectedResults, value)
return r
@@ -227,8 +227,8 @@ func TestQuery(t *testing.T) {
req.EXPECT().GetColNames().Return(nil).Maybe()
req.EXPECT().Validate().Return(nil).Once()
req.EXPECT().GetArgs().Return(nil).Once()
rows.Rows.AddRow() // we don't expect GetScanDest or Results here
rows.Rows.RowError(0, errTest)
rows.AddRow() // we don't expect GetScanDest or Results here
rows.RowError(0, errTest)
rdb.SQLMock.ExpectQuery("").WillReturnRows(rows.Rows)
// execute and assert
@@ -254,7 +254,7 @@ func TestQuery(t *testing.T) {
req.EXPECT().Validate().Return(nil).Once()
req.EXPECT().GetArgs().Return(nil).Once()
rows1.Add(1, nil)
rows2.Rows.AddRow() // we don't expect GetScanDest or Results here
rows2.AddRow() // we don't expect GetScanDest or Results here
rdb.SQLMock.ExpectQuery("").WillReturnRows(rows1.Rows, rows2.Rows)
// execute and assert
@@ -377,7 +377,7 @@ func TestQueryRow(t *testing.T) {
req.EXPECT().Validate().Return(nil).Once()
req.EXPECT().GetArgs().Return(nil).Once()
rows1.Add(1, nil)
rows2.Rows.AddRow() // we don't expect GetScanDest or Results here
rows2.AddRow() // we don't expect GetScanDest or Results here
rdb.SQLMock.ExpectQuery("").WillReturnRows(rows1.Rows, rows2.Rows)
// execute and assert