Use require.NoError where appropriate (#39)

main_test.go

@@ -12,7 +12,7 @@ import (
 
 func testContext(t *testing.T, u *url.URL) *cli.Context {
 	err := os.Setenv("DATABASE_URL", u.String())
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	app := NewApp()
 	flagset := flag.NewFlagSet(app.Name, flag.ContinueOnError)
@@ -25,11 +25,11 @@ func testContext(t *testing.T, u *url.URL) *cli.Context {
 
 func TestGetDatabaseUrl(t *testing.T) {
 	envURL, err := url.Parse("foo://example.org/db")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	ctx := testContext(t, envURL)
 
 	u, err := getDatabaseURL(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	require.Equal(t, "foo", u.Scheme)
 	require.Equal(t, "example.org", u.Host)

pkg/dbmate/db_test.go

@@ -19,10 +19,10 @@ func newTestDB(t *testing.T, u *url.URL) *DB {
 	// only chdir once, because testdata is relative to current directory
 	if testdataDir == "" {
 		testdataDir, err = filepath.Abs("../../testdata")
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		err = os.Chdir(testdataDir)
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}
 
 	db := New(u)
@@ -52,11 +52,11 @@ func TestWait(t *testing.T) {
 
 	// drop database
 	err := db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// test wait
 	err = db.Wait()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// test invalid connection
 	u.Host = "postgres:404"
@@ -72,10 +72,10 @@ func TestDumpSchema(t *testing.T) {
 
 	// create custom schema file directory
 	dir, err := ioutil.TempDir("", "dbmate")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer func() {
 		err := os.RemoveAll(dir)
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}()
 
 	// create schema.sql in subdirectory to test creating directory
@@ -83,11 +83,11 @@ func TestDumpSchema(t *testing.T) {
 
 	// drop database
 	err = db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create and migrate
 	err = db.CreateAndMigrate()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// schema.sql should not exist
 	_, err = os.Stat(db.SchemaFile)
@@ -95,11 +95,11 @@ func TestDumpSchema(t *testing.T) {
 
 	// dump schema
 	err = db.DumpSchema()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify schema
 	schema, err := ioutil.ReadFile(db.SchemaFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "-- PostgreSQL database dump")
 }
 
@@ -110,10 +110,10 @@ func TestAutoDumpSchema(t *testing.T) {
 
 	// create custom schema file directory
 	dir, err := ioutil.TempDir("", "dbmate")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer func() {
 		err := os.RemoveAll(dir)
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}()
 
 	// create schema.sql in subdirectory to test creating directory
@@ -121,7 +121,7 @@ func TestAutoDumpSchema(t *testing.T) {
 
 	// drop database
 	err = db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// schema.sql should not exist
 	_, err = os.Stat(db.SchemaFile)
@@ -129,24 +129,24 @@ func TestAutoDumpSchema(t *testing.T) {
 
 	// create and migrate
 	err = db.CreateAndMigrate()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify schema
 	schema, err := ioutil.ReadFile(db.SchemaFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "-- PostgreSQL database dump")
 
 	// remove schema
 	err = os.Remove(db.SchemaFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// rollback
 	err = db.Rollback()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// schema should be recreated
 	schema, err = ioutil.ReadFile(db.SchemaFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "-- PostgreSQL database dump")
 }
 
@@ -163,27 +163,27 @@ func testMigrateURL(t *testing.T, u *url.URL) {
 
 	// drop and recreate database
 	err := db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = db.Create()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// migrate
 	err = db.Migrate()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify results
 	sqlDB, err := GetDriverOpen(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer mustClose(sqlDB)
 
 	count := 0
 	err = sqlDB.QueryRow(`select count(*) from schema_migrations
 		where version = '20151129054053'`).Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 
 	err = sqlDB.QueryRow("select count(*) from users").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -198,25 +198,25 @@ func testUpURL(t *testing.T, u *url.URL) {
 
 	// drop database
 	err := db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create and migrate
 	err = db.CreateAndMigrate()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify results
 	sqlDB, err := GetDriverOpen(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer mustClose(sqlDB)
 
 	count := 0
 	err = sqlDB.QueryRow(`select count(*) from schema_migrations
 		where version = '20151129054053'`).Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 
 	err = sqlDB.QueryRow("select count(*) from users").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -231,30 +231,30 @@ func testRollbackURL(t *testing.T, u *url.URL) {
 
 	// drop, recreate, and migrate database
 	err := db.Drop()
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = db.Create()
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = db.Migrate()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify migration
 	sqlDB, err := GetDriverOpen(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer mustClose(sqlDB)
 
 	count := 0
 	err = sqlDB.QueryRow(`select count(*) from schema_migrations
 		where version = '20151129054053'`).Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 
 	// rollback
 	err = db.Rollback()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// verify rollback
 	err = sqlDB.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 0, count)
 
 	err = sqlDB.QueryRow("select count(*) from users").Scan(&count)

pkg/dbmate/driver_test.go

@@ -8,20 +8,20 @@ import (
 
 func TestGetDriver_Postgres(t *testing.T) {
 	drv, err := GetDriver("postgres")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	_, ok := drv.(PostgresDriver)
 	require.Equal(t, true, ok)
 }
 
 func TestGetDriver_MySQL(t *testing.T) {
 	drv, err := GetDriver("mysql")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	_, ok := drv.(MySQLDriver)
 	require.Equal(t, true, ok)
 }
 
 func TestGetDriver_Error(t *testing.T) {
 	drv, err := GetDriver("foo")
-	require.Equal(t, "unsupported driver: foo", err.Error())
+	require.EqualError(t, err, "unsupported driver: foo")
 	require.Nil(t, drv)
 }

pkg/dbmate/mysql_test.go

@@ -10,7 +10,7 @@ import (
 
 func mySQLTestURL(t *testing.T) *url.URL {
 	u, err := url.Parse("mysql://root:root@mysql/dbmate")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return u
 }
@@ -21,22 +21,22 @@ func prepTestMySQLDB(t *testing.T) *sql.DB {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// connect database
 	db, err := drv.Open(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return db
 }
 
 func TestNormalizeMySQLURLDefaults(t *testing.T) {
 	u, err := url.Parse("mysql://host/foo")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "", u.Port())
 
 	s := normalizeMySQLURL(u)
@@ -45,7 +45,7 @@ func TestNormalizeMySQLURLDefaults(t *testing.T) {
 
 func TestNormalizeMySQLURLCustom(t *testing.T) {
 	u, err := url.Parse("mysql://bob:secret@host:123/foo?flag=on")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "123", u.Port())
 
 	s := normalizeMySQLURL(u)
@@ -58,30 +58,30 @@ func TestMySQLCreateDropDatabase(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database exists and we can connect to it
 	func() {
 		db, err := drv.Open(u)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer mustClose(db)
 
 		err = db.Ping()
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}()
 
 	// drop the database
 	err = drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database no longer exists
 	func() {
 		db, err := drv.Open(u)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer mustClose(db)
 
 		err = db.Ping()
@@ -98,17 +98,17 @@ func TestMySQLDumpSchema(t *testing.T) {
 	db := prepTestMySQLDB(t)
 	defer mustClose(db)
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = drv.InsertMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DumpSchema should return schema
 	schema, err := drv.DumpSchema(u, db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "CREATE TABLE `schema_migrations`")
 	require.Contains(t, string(schema), "\n-- Dump completed\n\n"+
 		"--\n"+
@@ -124,9 +124,8 @@ func TestMySQLDumpSchema(t *testing.T) {
 	u.Path = "/fakedb"
 	schema, err = drv.DumpSchema(u, db)
 	require.Nil(t, schema)
-	require.NotNil(t, err)
+	require.EqualError(t, err, "mysqldump: Got error: 1049: "+
-	require.Equal(t, "mysqldump: Got error: 1049: \"Unknown database 'fakedb'\" "+
+		"\"Unknown database 'fakedb'\" when selecting the database")
-		"when selecting the database", err.Error())
 }
 
 func TestMySQLDatabaseExists(t *testing.T) {
@@ -135,20 +134,20 @@ func TestMySQLDatabaseExists(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return false
 	exists, err := drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, false, exists)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return true
 	exists, err = drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, exists)
 }
 
@@ -174,15 +173,15 @@ func TestMySQLCreateMigrationsTable(t *testing.T) {
 
 	// create table
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// migrations table should exist
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create table should be idempotent
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestMySQLSelectMigrations(t *testing.T) {
@@ -191,21 +190,21 @@ func TestMySQLSelectMigrations(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc2'), ('abc1'), ('abc3')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	migrations, err := drv.SelectMigrations(db, -1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc1"])
 	require.Equal(t, true, migrations["abc2"])
 	require.Equal(t, true, migrations["abc2"])
 
 	// test limit param
 	migrations, err = drv.SelectMigrations(db, 1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc3"])
 	require.Equal(t, false, migrations["abc1"])
 	require.Equal(t, false, migrations["abc2"])
@@ -217,20 +216,20 @@ func TestMySQLInsertMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 0, count)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = db.QueryRow("select count(*) from schema_migrations where version = 'abc1'").
 		Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -240,18 +239,18 @@ func TestMySQLDeleteMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc1'), ('abc2')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = drv.DeleteMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -261,11 +260,11 @@ func TestMySQLPing(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// ping database
 	err = drv.Ping(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// ping invalid host should return error
 	u.Host = "mysql:404"

pkg/dbmate/postgres_test.go

@@ -10,7 +10,7 @@ import (
 
 func postgresTestURL(t *testing.T) *url.URL {
 	u, err := url.Parse("postgres://postgres:postgres@postgres/dbmate?sslmode=disable")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return u
 }
@@ -21,15 +21,15 @@ func prepTestPostgresDB(t *testing.T) *sql.DB {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// connect database
 	db, err := sql.Open("postgres", u.String())
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return db
 }
@@ -40,30 +40,30 @@ func TestPostgresCreateDropDatabase(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database exists and we can connect to it
 	func() {
 		db, err := sql.Open("postgres", u.String())
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer mustClose(db)
 
 		err = db.Ping()
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}()
 
 	// drop the database
 	err = drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database no longer exists
 	func() {
 		db, err := sql.Open("postgres", u.String())
-		require.Nil(t, err)
+		require.NoError(t, err)
 		defer mustClose(db)
 
 		err = db.Ping()
@@ -80,17 +80,17 @@ func TestPostgresDumpSchema(t *testing.T) {
 	db := prepTestPostgresDB(t)
 	defer mustClose(db)
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = drv.InsertMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DumpSchema should return schema
 	schema, err := drv.DumpSchema(u, db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "CREATE TABLE schema_migrations")
 	require.Contains(t, string(schema), "\n--\n"+
 		"-- PostgreSQL database dump complete\n"+
@@ -106,9 +106,8 @@ func TestPostgresDumpSchema(t *testing.T) {
 	u.Path = "/fakedb"
 	schema, err = drv.DumpSchema(u, db)
 	require.Nil(t, schema)
-	require.NotNil(t, err)
+	require.EqualError(t, err, "pg_dump: [archiver (db)] connection to database "+
-	require.Equal(t, "pg_dump: [archiver (db)] connection to database \"fakedb\" failed: "+
+		"\"fakedb\" failed: FATAL:  database \"fakedb\" does not exist")
-		"FATAL:  database \"fakedb\" does not exist", err.Error())
 }
 
 func TestPostgresDatabaseExists(t *testing.T) {
@@ -117,20 +116,20 @@ func TestPostgresDatabaseExists(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return false
 	exists, err := drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, false, exists)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return true
 	exists, err = drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, exists)
 }
 
@@ -156,15 +155,15 @@ func TestPostgresCreateMigrationsTable(t *testing.T) {
 
 	// create table
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// migrations table should exist
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create table should be idempotent
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestPostgresSelectMigrations(t *testing.T) {
@@ -173,21 +172,21 @@ func TestPostgresSelectMigrations(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc2'), ('abc1'), ('abc3')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	migrations, err := drv.SelectMigrations(db, -1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc1"])
 	require.Equal(t, true, migrations["abc2"])
 	require.Equal(t, true, migrations["abc2"])
 
 	// test limit param
 	migrations, err = drv.SelectMigrations(db, 1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc3"])
 	require.Equal(t, false, migrations["abc1"])
 	require.Equal(t, false, migrations["abc2"])
@@ -199,20 +198,20 @@ func TestPostgresInsertMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 0, count)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = db.QueryRow("select count(*) from schema_migrations where version = 'abc1'").
 		Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -222,18 +221,18 @@ func TestPostgresDeleteMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc1'), ('abc2')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = drv.DeleteMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -243,11 +242,11 @@ func TestPostgresPing(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// ping database
 	err = drv.Ping(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// ping invalid host should return error
 	u.Host = "postgres:404"

pkg/dbmate/sqlite_test.go

@@ -13,7 +13,7 @@ import (
 
 func sqliteTestURL(t *testing.T) *url.URL {
 	u, err := url.Parse("sqlite3:////tmp/dbmate.sqlite3")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return u
 }
@@ -24,15 +24,15 @@ func prepTestSQLiteDB(t *testing.T) *sql.DB {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// connect database
 	db, err := drv.Open(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	return db
 }
@@ -44,19 +44,19 @@ func TestSQLiteCreateDropDatabase(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database exists
 	_, err = os.Stat(path)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// drop the database
 	err = drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that database no longer exists
 	_, err = os.Stat(path)
@@ -72,17 +72,17 @@ func TestSQLiteDumpSchema(t *testing.T) {
 	db := prepTestSQLiteDB(t)
 	defer mustClose(db)
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	err = drv.InsertMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DumpSchema should return schema
 	schema, err := drv.DumpSchema(u, db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Contains(t, string(schema), "CREATE TABLE schema_migrations")
 	require.Contains(t, string(schema), ");\n-- Dbmate schema migrations\n"+
 		"INSERT INTO schema_migrations (version) VALUES\n"+
@@ -93,9 +93,8 @@ func TestSQLiteDumpSchema(t *testing.T) {
 	u.Path = "/."
 	schema, err = drv.DumpSchema(u, db)
 	require.Nil(t, schema)
-	require.NotNil(t, err)
+	require.EqualError(t, err, "Error: unable to open database \".\": "+
-	require.Equal(t, "Error: unable to open database \".\": unable to open database file",
+		"unable to open database file")
-		err.Error())
 }
 
 func TestSQLiteDatabaseExists(t *testing.T) {
@@ -104,20 +103,20 @@ func TestSQLiteDatabaseExists(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return false
 	exists, err := drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, false, exists)
 
 	// create database
 	err = drv.CreateDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// DatabaseExists should return true
 	exists, err = drv.DatabaseExists(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, exists)
 }
 
@@ -133,15 +132,15 @@ func TestSQLiteCreateMigrationsTable(t *testing.T) {
 
 	// create table
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// migrations table should exist
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create table should be idempotent
 	err = drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
 
 func TestSQLiteSelectMigrations(t *testing.T) {
@@ -150,21 +149,21 @@ func TestSQLiteSelectMigrations(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc2'), ('abc1'), ('abc3')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	migrations, err := drv.SelectMigrations(db, -1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc1"])
 	require.Equal(t, true, migrations["abc2"])
 	require.Equal(t, true, migrations["abc2"])
 
 	// test limit param
 	migrations, err = drv.SelectMigrations(db, 1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, true, migrations["abc3"])
 	require.Equal(t, false, migrations["abc1"])
 	require.Equal(t, false, migrations["abc2"])
@@ -176,20 +175,20 @@ func TestSQLiteInsertMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 0, count)
 
 	// insert migration
 	err = drv.InsertMigration(db, "abc1")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = db.QueryRow("select count(*) from schema_migrations where version = 'abc1'").
 		Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -199,18 +198,18 @@ func TestSQLiteDeleteMigration(t *testing.T) {
 	defer mustClose(db)
 
 	err := drv.CreateMigrationsTable(db)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	_, err = db.Exec(`insert into schema_migrations (version)
 		values ('abc1'), ('abc2')`)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = drv.DeleteMigration(db, "abc2")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	count := 0
 	err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, 1, count)
 }
 
@@ -221,26 +220,26 @@ func TestSQLitePing(t *testing.T) {
 
 	// drop any existing database
 	err := drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// ping database
 	err = drv.Ping(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// check that the database was created (sqlite-only behavior)
 	_, err = os.Stat(path)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// drop the database
 	err = drv.DropDatabase(u)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// create directory where database file is expected
 	err = os.Mkdir(path, 0755)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer func() {
 		err = os.RemoveAll(path)
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}()
 
 	// ping database should fail

pkg/dbmate/utils_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestDatabaseName(t *testing.T) {
 	u, err := url.Parse("ignore://localhost/foo?query")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	name := databaseName(u)
 	require.Equal(t, "foo", name)
@@ -17,7 +17,7 @@ func TestDatabaseName(t *testing.T) {
 
 func TestDatabaseName_Empty(t *testing.T) {
 	u, err := url.Parse("ignore://localhost")
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	name := databaseName(u)
 	require.Equal(t, "", name)
@@ -30,6 +30,6 @@ func TestTrimLeadingSQLComments(t *testing.T) {
 		"real stuff\n" +
 		"-- end\n"
 	out, err := trimLeadingSQLComments([]byte(in))
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, "real stuff\n-- end\n", string(out))
 }