Replace testify with gotest.tools (#553)

* vendor gotest.tools

* Run gotest.tools migration tools

* Fixup tests that were improperly converted

* Remove unused testify package vendors

providers/vic/operations/pod_stopper_test.go

@@ -3,9 +3,9 @@ package operations
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/vmware/vic/lib/apiservers/portlayer/client"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNewPodStopper(t *testing.T) {
@@ -14,16 +14,16 @@ func TestNewPodStopper(t *testing.T) {
 
 	// Positive Cases
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
 
 	// Negative Cases
 	s, err = NewPodStopper(nil, ip)
-	assert.Nil(t, s, "Expected nil")
-	assert.Equal(t, err, PodStopperPortlayerClientError)
+	assert.Check(t, is.Nil(s), "Expected nil")
+	assert.Check(t, is.DeepEqual(err, PodStopperPortlayerClientError))
 
 	s, err = NewPodStopper(client, nil)
-	assert.Nil(t, s, "Expected nil")
-	assert.Equal(t, err, PodStopperIsolationProxyError)
+	assert.Check(t, is.Nil(s), "Expected nil")
+	assert.Check(t, is.DeepEqual(err, PodStopperIsolationProxyError))
 }
 
 func TestStopPod(t *testing.T) {
@@ -32,8 +32,8 @@ func TestStopPod(t *testing.T) {
 
 	// Start with arguments
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, err, "Expected nil")
 
 	// Set up the mocks for this test
 	ip.On("Handle", op, podID, podName).Return(podHandle, nil)
@@ -43,7 +43,7 @@ func TestStopPod(t *testing.T) {
 
 	// Positive case
 	err = s.Stop(op, podID, podName)
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, err, "Expected nil")
 }
 
 func TestStopPodErrorHandle(t *testing.T) {
@@ -52,8 +52,8 @@ func TestStopPodErrorHandle(t *testing.T) {
 
 	// Start with arguments
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, err, "Expected nil")
 
 	// Set up the mocks for this test
 	ip.On("UnbindScope", op, podHandle, podName).Return(podHandle, fakeEP, nil)
@@ -65,7 +65,7 @@ func TestStopPodErrorHandle(t *testing.T) {
 	ip.On("Handle", op, podID, podName).Return("", fakeErr)
 
 	err = s.Stop(op, podID, podName)
-	assert.Equal(t, err, fakeErr, "Expected invalid handle error")
+	assert.Check(t, is.Error(err, fakeErr.Error()), "Expected invalid handle error")
 }
 
 func TestStopPodErrorUnbindScope(t *testing.T) {
@@ -74,8 +74,8 @@ func TestStopPodErrorUnbindScope(t *testing.T) {
 
 	// Start with arguments
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, err, "Expected nil")
 
 	// Set up the mocks for this test
 	ip.On("Handle", op, podID, podName).Return(podHandle, nil)
@@ -87,7 +87,7 @@ func TestStopPodErrorUnbindScope(t *testing.T) {
 	ip.On("UnbindScope", op, podHandle, podName).Return("", nil, fakeErr)
 
 	err = s.Stop(op, podID, podName)
-	assert.Equal(t, err, fakeErr, "Expected failed UnbindScope error")
+	assert.Check(t, is.Error(err, fakeErr.Error()), "Expected failed UnbindScope error")
 }
 
 func TestStopPodErrorSetState(t *testing.T) {
@@ -96,8 +96,8 @@ func TestStopPodErrorSetState(t *testing.T) {
 
 	// Start with arguments
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, err, "Expected nil")
 
 	// Set up the mocks for this test
 	ip.On("Handle", op, podID, podName).Return(podHandle, nil)
@@ -108,7 +108,7 @@ func TestStopPodErrorSetState(t *testing.T) {
 	fakeErr := fakeError("failed SetState")
 	ip.On("SetState", op, podHandle, podName, "STOPPED").Return("", fakeErr)
 	err = s.Stop(op, podID, podName)
-	assert.Equal(t, err, fakeErr, "Expected failed SetState error")
+	assert.Check(t, is.Error(err, fakeErr.Error()), "Expected failed SetState error")
 }
 
 func TestStopPodErrorCommit(t *testing.T) {
@@ -117,8 +117,8 @@ func TestStopPodErrorCommit(t *testing.T) {
 
 	// Start with arguments
 	s, err := NewPodStopper(client, ip)
-	assert.NotNil(t, s, "Expected non-nil creating a pod Stopper but received nil")
-	assert.Nil(t, err, "Expected nil")
+	assert.Check(t, s != nil, "Expected non-nil creating a pod Stopper but received nil")
+	assert.Check(t, err, "Expected nil")
 
 	// Set up the mocks for this test
 	ip.On("Handle", op, podID, podName).Return(podHandle, nil)
@@ -129,5 +129,5 @@ func TestStopPodErrorCommit(t *testing.T) {
 	fakeErr := fakeError("failed Commit")
 	ip.On("CommitHandle", op, podHandle, podID, int32(-1)).Return(fakeErr)
 	err = s.Stop(op, podID, podName)
-	assert.Equal(t, err, fakeErr ,"Expected failed Commit error")
-}
+	assert.Check(t, is.Error(err, fakeErr.Error()), "Expected failed Commit error")
+}