Merge pull request clearcontainers#587 from mcastelino/topic/govet

Fix go vet issues flagged by go 1.9
jcvenegas · Sep 25, 2017 · 535be19 · 535be19
2 parents 7e2466d + 5213667
commit 535be19
Show file tree

Hide file tree

Showing 11 changed files with 825 additions and 118 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/create_test.go b/create_test.go
@@ -324,7 +324,7 @@ func TestCreateInvalidArgs(t *testing.T) {
 
 	for i, d := range data {
 		err := create(d.containerID, d.bundlePath, d.console, d.pidFilePath, d.detach, d.runtimeConfig)
-		assert.Error(err, "test %d (%+v)", i, d)
+		assert.Errorf(err, "test %d (%+v)", i, d)
 	}
 }
 
@@ -367,7 +367,7 @@ func TestCreateInvalidConfigJSON(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }
@@ -414,7 +414,7 @@ func TestCreateInvalidContainerType(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }
@@ -462,7 +462,7 @@ func TestCreateContainerInvalid(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }
@@ -637,7 +637,7 @@ func TestCreateCreateCgroupsFilesFail(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }
@@ -713,7 +713,7 @@ func TestCreateCreateCreatePidFileFail(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }
@@ -839,7 +839,7 @@ func TestCreateInvalidKernelParams(t *testing.T) {
 
 	for detach := range []bool{true, false} {
 		err := create(testContainerID, bundlePath, testConsole, pidFilePath, true, runtimeConfig)
-		assert.Error(err, "%+v", detach)
+		assert.Errorf(err, "%+v", detach)
 		assert.False(vcMock.IsMockError(err))
 	}
 }

diff --git a/main_test.go b/main_test.go
@@ -648,7 +648,7 @@ func TestMainBeforeSubCommands(t *testing.T) {
 		err := beforeSubcommands(ctx)
 
 		if d.expectError {
-			assert.Error(err, "test %d (%+v)", i, d)
+			assert.Errorf(err, "test %d (%+v)", i, d)
 		} else {
 			assert.NoError(err, "test %d (%+v)", i, d)
 		}

diff --git a/run_test.go b/run_test.go
@@ -151,7 +151,7 @@ func TestRunInvalidArgs(t *testing.T) {
 
 	for i, a := range args {
 		err := run(a.containerID, a.bundle, a.console, a.consoleSocket, a.pidFile, a.detach, a.runtimeConfig)
-		assert.Error(err, "test %d (%+v)", i, a)
+		assert.Errorf(err, "test %d (%+v)", i, a)
 	}
 }
 

diff --git a/vendor/github.com/stretchr/testify/.travis.yml b/vendor/github.com/stretchr/testify/.travis.yml