Merge pull request #2784 from mboersma/fix-deisctl-unit-tests

Matthew Fisher · Matthew Fisher · commit 6c88567b995f · 2014-12-20T12:24:56.000-08:00
fix(deisctl): unit test should also use main version package
diff --git a/deisctl/deisctl_test.go b/deisctl/deisctl_test.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/deis/deis/version"
 )
 
 // commandOutput returns stdout for a deisctl command line as a string.
@@ -54,7 +56,7 @@ func TestUsage(t *testing.T) {
 func TestVersion(t *testing.T) {
 	args := []string{"--version"}
 	out := commandOutput(args)
-	if !strings.HasPrefix(out, Version) {
+	if !strings.HasPrefix(out, version.Version) {
 		t.Error(out)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import (`
`6`	`6`	`"os"`
`7`	`7`	`"strings"`
`8`	`8`	`"testing"`
	`9`	`+`
	`10`	`+ "github.com/deis/deis/version"`
`9`	`11`	`)`
`10`	`12`
`11`	`13`	`// commandOutput returns stdout for a deisctl command line as a string.`
`@@ -54,7 +56,7 @@ func TestUsage(t *testing.T) {`
`54`	`56`	`func TestVersion(t *testing.T) {`
`55`	`57`	`args := []string{"--version"}`
`56`	`58`	`out := commandOutput(args)`
`57`		`- if !strings.HasPrefix(out, Version) {`
	`59`	`+ if !strings.HasPrefix(out, version.Version) {`
`58`	`60`	`t.Error(out)`
`59`	`61`	`}`
`60`	`62`	`}`