diff --git a/mysql_test.go b/mysql_test.go index bcf2c60d..93b67ce4 100644 --- a/mysql_test.go +++ b/mysql_test.go @@ -254,94 +254,6 @@ func TestDBWrapper_SqlExec(t *testing.T) { mockDb.AssertExpectations(t) } -func TestDBWrapper_SqlExecQuiet(t *testing.T) { - mockDb := new(DbMock) - dbw := NewTestDBW(mockDb) - - mockDb.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, errors.New("whoops")).Once() - mockDb.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, nil).Once() - mockDb.On("Ping").Return(errors.New("whoops")).Once() - - var err error - done := make(chan bool) - - dbw.CompareAndSetConnected(true) - go func() { - _, err = dbw.SqlExecQuiet("test", "test") - done <- true - }() - - time.Sleep(time.Millisecond * 50) - - dbw.CompareAndSetConnected(true) - dbw.ConnectionUpCondition.Broadcast() - - <- done - - assert.NoError(t, err) - mockDb.AssertExpectations(t) -} - -func TestDBWrapper_SqlExecTx(t *testing.T) { - mockDb := new(DbMock) - dbw := NewTestDBW(mockDb) - mockTx := new(TransactionMock) - - mockTx.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, errors.New("whoops")).Once() - mockTx.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, nil).Once() - mockDb.On("Ping").Return(errors.New("whoops")).Once() - - var err error - done := make(chan bool) - - dbw.CompareAndSetConnected(true) - go func() { - _, err = dbw.SqlExecTx(mockTx, "test", "test") - done <- true - }() - - time.Sleep(time.Millisecond * 50) - - dbw.CompareAndSetConnected(true) - dbw.ConnectionUpCondition.Broadcast() - - <- done - - assert.NoError(t, err) - mockTx.AssertExpectations(t) - mockDb.AssertExpectations(t) -} - -func TestDBWrapper_SqlExecTxQuiet(t *testing.T) { - mockDb := new(DbMock) - dbw := NewTestDBW(mockDb) - mockTx := new(TransactionMock) - - mockTx.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, errors.New("whoops")).Once() - mockTx.On("Exec", "test", []interface{}(nil)).Return(SqlResultMock{}, nil).Once() - mockDb.On("Ping").Return(errors.New("whoops")).Once() - - var err error - done := make(chan bool) - - dbw.CompareAndSetConnected(true) - go func() { - _, err = dbw.SqlExecTxQuiet(mockTx, "test", "test") - done <- true - }() - - time.Sleep(time.Millisecond * 50) - - dbw.CompareAndSetConnected(true) - dbw.ConnectionUpCondition.Broadcast() - - <- done - - assert.NoError(t, err) - mockTx.AssertExpectations(t) - mockDb.AssertExpectations(t) -} - func TestGetConnectionCheckInterval(t *testing.T) { dbw := NewTestDBW(nil)