@@ -89,10 +89,11 @@ func TestExecuteBuild(t *testing.T) {
8989if err != nil {
9090t .Fatal ("error while running executebuild. none was expected" )
9191}
92- expectedArgs := "-test.run=TestExecCommandContextHelper,--,/usr/local/bin/go,get,-d,./...:-test.run=TestExecCommandContextHelper,--,/usr/local/bin/go,build,-o,_"
92+ expectedDepArgs := "get,-d,./..."
93+ expectedBuildArgs := "build,-o,_"
9394actualArgs := os .Getenv ("CMD_ARGS" )
94- if expectedArgs != actualArgs {
95- t .Fatalf ("expected args '%s' actual args '%s'" ,expectedArgs ,actualArgs )
95+ if ! strings . Contains ( actualArgs , expectedBuildArgs ) && ! strings . Contains ( actualArgs , expectedDepArgs ) {
96+ t .Fatalf ("expected args '%s, %s ' actual args '%s'" ,expectedDepArgs , expectedBuildArgs ,actualArgs )
9697}
9798}
9899
@@ -122,10 +123,8 @@ func TestExecuteBuildFailPipelineBuild(t *testing.T) {
122123if err == nil {
123124t .Fatal ("error while running executebuild. none was expected" )
124125}
125- expected := `# _/Users/gbrautigam/gohome/src/github.com/gaia-pipeline/gaia/pipeline/tmp
126- ./main.go:4:13: syntax error: unexpected newline, expecting comma or )
127- `
128- if p .Output != expected {
126+ expected := "syntax error: unexpected newline, expecting comma or )"
127+ if ! strings .Contains (p .Output ,expected ) {
129128t .Fatal ("got a different output than expected: " ,p .Output )
130129}
131130}