mirror of
https://github.com/DATA-DOG/go-sqlmock.git
synced 2025-01-05 22:53:26 +02:00
updates travis to validate with go fmt
This commit is contained in:
parent
d1ba2809d5
commit
b2ca44a80b
@ -8,9 +8,12 @@ go:
|
||||
- 1.6.x
|
||||
- 1.7.x
|
||||
- 1.8.x
|
||||
- tip
|
||||
# - tip # sadly fails most of thw times
|
||||
|
||||
script: go test -race -coverprofile=coverage.txt -covermode=atomic
|
||||
script:
|
||||
- go vet
|
||||
- test -z "$(go fmt ./...)" # fail if not formatted properly
|
||||
- go test -race -coverprofile=coverage.txt -covermode=atomic
|
||||
|
||||
after_success:
|
||||
- bash <(curl -s https://codecov.io/bash)
|
||||
|
@ -109,4 +109,4 @@ func TestDuplicateNewDSN(t *testing.T) {
|
||||
if _, _, err := NewWithDSN("sqlmock_db_1"); err == nil {
|
||||
t.Error("expected error on NewWithDSN")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -309,9 +309,9 @@ func (c *sqlmock) prepare(query string) (*ExpectedPrepare, error) {
|
||||
var expected *ExpectedPrepare
|
||||
var fulfilled int
|
||||
var ok bool
|
||||
|
||||
|
||||
query = stripQuery(query)
|
||||
|
||||
|
||||
for _, next := range c.expected {
|
||||
next.Lock()
|
||||
if next.fulfilled() {
|
||||
@ -328,7 +328,7 @@ func (c *sqlmock) prepare(query string) (*ExpectedPrepare, error) {
|
||||
next.Unlock()
|
||||
return nil, fmt.Errorf("call to Prepare statement with query '%s', was not expected, next expectation is: %s", query, next)
|
||||
}
|
||||
|
||||
|
||||
if pr, ok := next.(*ExpectedPrepare); ok {
|
||||
if pr.sqlRegex.MatchString(query) {
|
||||
expected = pr
|
||||
|
@ -354,7 +354,6 @@ func TestPreparedQueryExecutions(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func TestUnorderedPreparedQueryExecutions(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, mock, err := New()
|
||||
@ -369,14 +368,14 @@ func TestUnorderedPreparedQueryExecutions(t *testing.T) {
|
||||
ExpectQuery().
|
||||
WithArgs(5).
|
||||
WillReturnRows(
|
||||
NewRows([]string{"id", "title"}).FromCSVString("5,The quick brown fox"),
|
||||
)
|
||||
NewRows([]string{"id", "title"}).FromCSVString("5,The quick brown fox"),
|
||||
)
|
||||
mock.ExpectPrepare("SELECT (.+) FROM authors WHERE id = ?").
|
||||
ExpectQuery().
|
||||
WithArgs(1).
|
||||
WillReturnRows(
|
||||
NewRows([]string{"id", "title"}).FromCSVString("1,Betty B."),
|
||||
)
|
||||
NewRows([]string{"id", "title"}).FromCSVString("1,Betty B."),
|
||||
)
|
||||
|
||||
var id int
|
||||
var name string
|
||||
|
Loading…
Reference in New Issue
Block a user