From 5b6166bfbf40598012f5369281bdbc793f54f95e Mon Sep 17 00:00:00 2001
From: gedi <gediminas.morkevicius@gmail.com>
Date: Sat, 17 Jan 2015 17:10:40 +0200
Subject: [PATCH] update travis

---
 .travis.yml | 20 ++++++++++++--------
 README.md   |  1 +
 sqlmock.go  |  3 +--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79099ac..464bcb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,16 @@
 language: go
 go:
- - 1.1
- - 1.2
- - 1.3
- - release
- - tip
+  - 1.2
+  - 1.3
+  - 1.4
+  - release
+  - tip
 
 script:
- - (go version | grep "version go1.1") || go get code.google.com/p/go.tools/cmd/vet
- - go vet ./...
- - go test -v ./...
+  - go get github.com/kisielk/errcheck
+  - go get ./...
+
+  - go test -v ./...
+  - go test -race ./...
+  - errcheck github.com/DATA-DOG/go-sqlmock
+
diff --git a/README.md b/README.md
index 58d4c63..bd2942f 100644
--- a/README.md
+++ b/README.md
@@ -329,6 +329,7 @@ rs := sqlmock.ExpectPrepare().
 ## Documentation
 
 Visit [godoc](http://godoc.org/github.com/DATA-DOG/go-sqlmock)
+See **.travis.yml** for supported **go** versions
 
 ## Changes
 
diff --git a/sqlmock.go b/sqlmock.go
index a1698d0..b73ab02 100644
--- a/sqlmock.go
+++ b/sqlmock.go
@@ -94,8 +94,7 @@ func New() (db *sql.DB, err error) {
 		return
 	}
 	// ensure open connection, otherwise Close does not assert expectations
-	db.Ping()
-	return
+	return db, db.Ping()
 }
 
 // ExpectBegin expects transaction to be started