pass unittests

Author: jschwinger233

types/options.go

@@ -39,7 +39,7 @@ func (o *DeployOptions) Validate() error {
 		return errors.WithStack(ErrEmptyAppName)
 	}
 	if o.Podname == "" {
-		return errors.WithStack(ErrEmptyAppName)
+		return errors.WithStack(ErrEmptyPodName)
 	}
 	if o.Image == "" {
 		return errors.WithStack(ErrEmptyImage)

types/options_test.go

@@ -3,6 +3,8 @@ package types
 import (
 	"testing"
 
+	"github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -18,7 +20,7 @@ func TestSetNodeOptions(t *testing.T) {
 		DeltaVolume:  VolumeMap{"/data": 1, "/data2": 2},
 		DeltaStorage: -10,
 	}
-	assert.Equal(t, ErrEmptyNodeName, o.Validate())
+	assert.Equal(t, ErrEmptyNodeName, errors.Unwrap(o.Validate()))
 
 	o.Nodename = "nodename"
 	assert.NoError(t, o.Validate())
@@ -43,22 +45,22 @@ func TestDeployOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &DeployOptions{Entrypoint: &Entrypoint{}}
-	assert.Equal(ErrEmptyAppName, o.Validate())
+	assert.Equal(ErrEmptyAppName, errors.Unwrap(o.Validate()))
 
 	o.Name = "testname"
-	assert.Equal(ErrEmptyPodName, o.Validate())
+	assert.Equal(ErrEmptyPodName, errors.Unwrap(o.Validate()))
 
 	o.Podname = "podname"
-	assert.Equal(ErrEmptyImage, o.Validate())
+	assert.Equal(ErrEmptyImage, errors.Unwrap(o.Validate()))
 
 	o.Image = "image"
-	assert.Equal(ErrEmptyCount, o.Validate())
+	assert.Equal(ErrEmptyCount, errors.Unwrap(o.Validate()))
 
 	o.Count = 1
-	assert.Equal(ErrEmptyEntrypointName, o.Validate())
+	assert.Equal(ErrEmptyEntrypointName, errors.Unwrap(o.Validate()))
 
 	o.Entrypoint.Name = "bad_entry_point"
-	assert.Equal(ErrUnderlineInEntrypointName, o.Validate())
+	assert.Equal(ErrUnderlineInEntrypointName, errors.Unwrap(o.Validate()))
 
 	o.Entrypoint.Name = "good-entry-point"
 	assert.NoError(o.Validate())
@@ -68,7 +70,7 @@ func TestCopyOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &CopyOptions{}
-	assert.Equal(ErrNoFilesToCopy, o.Validate())
+	assert.Equal(ErrNoFilesToCopy, errors.Unwrap(o.Validate()))
 
 	o.Targets = map[string][]string{
 		"workload_id": {
@@ -83,10 +85,10 @@ func TestSendOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &SendOptions{}
-	assert.Equal(ErrNoWorkloadIDs, o.Validate())
+	assert.Equal(ErrNoWorkloadIDs, errors.Unwrap(o.Validate()))
 
 	o.IDs = []string{"workload_id1", "workload_id2"}
-	assert.Equal(ErrNoFilesToSend, o.Validate())
+	assert.Equal(ErrNoFilesToSend, errors.Unwrap(o.Validate()))
 
 	o.Data = map[string][]byte{
 		"filepath1": []byte("filecontent1"),
@@ -99,13 +101,13 @@ func TestReplaceOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &ReplaceOptions{DeployOptions: DeployOptions{Entrypoint: &Entrypoint{}}}
-	assert.Equal(ErrEmptyAppName, o.Validate())
+	assert.Equal(ErrEmptyAppName, errors.Unwrap(o.Validate()))
 
 	o.DeployOptions.Name = "testname"
-	assert.Equal(ErrEmptyEntrypointName, o.Validate())
+	assert.Equal(ErrEmptyEntrypointName, errors.Unwrap(o.Validate()))
 
 	o.DeployOptions.Entrypoint.Name = "bad_entry_point"
-	assert.Equal(ErrUnderlineInEntrypointName, o.Validate())
+	assert.Equal(ErrUnderlineInEntrypointName, errors.Unwrap(o.Validate()))
 
 	o.DeployOptions.Entrypoint.Name = "good-entry-point"
 	assert.NoError(o.Validate())
@@ -122,13 +124,13 @@ func TestValidatingAddNodeOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &AddNodeOptions{}
-	assert.Equal(ErrEmptyNodeName, o.Validate())
+	assert.Equal(ErrEmptyNodeName, errors.Unwrap(o.Validate()))
 
 	o.Nodename = "nodename"
-	assert.Equal(ErrEmptyPodName, o.Validate())
+	assert.Equal(ErrEmptyPodName, errors.Unwrap(o.Validate()))
 
 	o.Podname = "podname"
-	assert.Equal(ErrEmptyNodeEndpoint, o.Validate())
+	assert.Equal(ErrEmptyNodeEndpoint, errors.Unwrap(o.Validate()))
 
 	o.Endpoint = "tcp://endpoint:2376"
 	assert.NoError(o.Validate())
@@ -138,7 +140,7 @@ func TestImageOptions(t *testing.T) {
 	assert := assert.New(t)
 
 	o := &ImageOptions{Step: -1}
-	assert.Equal(ErrEmptyPodName, o.Validate())
+	assert.Equal(ErrEmptyPodName, errors.Unwrap(o.Validate()))
 
 	o.Podname = "podname"
 	assert.NoError(o.Validate())