Skip to content

Commit 62657cc

Browse files
drivebyercndoit18
authored andcommitted
test: fix dsn will never be check with expectedDSN
1 parent 42e15e6 commit 62657cc

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pkg/controller/mysqluser/mysqluser_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ var _ = Describe("MySQL user controller", func() {
158158
return nil
159159
}
160160

161-
fakeSQL.AssertDSN(expectedDSN)
161+
fakeSQL.AddExpectedDSN(expectedDSN)
162162
// the create user runs twice
163163
fakeSQL.AddExpectedCalls(expectedQueryRunnerCall)
164164
fakeSQL.AddExpectedCalls(expectedQueryRunnerCall)
@@ -262,7 +262,7 @@ var _ = Describe("MySQL user controller", func() {
262262
return nil
263263
}
264264

265-
fakeSQL.AssertDSN(expectedDSN)
265+
fakeSQL.AddExpectedDSN(expectedDSN)
266266
fakeSQL.AddExpectedCalls(expectedQueryRunnerCall)
267267
fakeSQL.AddExpectedCalls(expectedQueryRunnerCall)
268268

@@ -490,7 +490,7 @@ var _ = Describe("MySQL user controller", func() {
490490
return deletionResult
491491
}
492492

493-
fakeSQL.AssertDSN(expectedDSN)
493+
fakeSQL.AddExpectedDSN(expectedDSN)
494494
fakeSQL.AddExpectedCalls(expectedQueryRunnerCall)
495495

496496
Expect(c.Delete(context.TODO(), user.Unwrap())).To(Succeed())

pkg/internal/mysql/fake/mysql.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ func (qr *SQLRunner) AddExpectedCalls(expectedCalls ...SQLCall) {
4747
qr.expectedCalls = append(qr.expectedCalls, expectedCalls...)
4848
}
4949

50+
// AddExpectedDSN add a expected DSN to the fake SQLRunner for later assert.
51+
func (qr *SQLRunner) AddExpectedDSN(expectedDSN string) {
52+
qr.lock.Lock()
53+
defer qr.lock.Unlock()
54+
qr.expectedDSN = &expectedDSN
55+
}
56+
5057
// PurgeExpectedCalls removes all the expected query runner calls
5158
func (qr *SQLRunner) PurgeExpectedCalls() {
5259
qr.lock.Lock()

0 commit comments

Comments
 (0)