make integration now works with the mobile-core dev-setup openshift

Author: AdamSaleh

Makefile

@@ -46,10 +46,9 @@ fmt:
 check: errcheck vet fmt test-unit
 
 .PHONY: integration
-integration:
-	go build -o mobile ./cmd/mobile
-	go test ./integration
+integration: build
+	go test -v ./integration -args -namespace=`oc project -q` -executable=`pwd`/mobile
 
 .PHONY: release
 release: setup
-	goreleaser --rm-dist
+	goreleaser --rm-dist

integration/client_crudl_test.go

@@ -64,7 +64,7 @@ func TestClientJson(t *testing.T) {
 			m.Args("get", "client", expectedId).Should(notExists).Run().Test(t)
 			o.Args("get", "mobileclient", expectedId).Should(notExists).Run().Test(t)
 			m.Args("create", "client", name, clientType).Should(exists).Run().Test(t)
-			m.Args("get", "client", expectedId).Should(exists).Run(t).Run().Test(t)
+			m.Args("get", "client", expectedId).Should(exists).Run().Test(t)
 			o.Args("get", "mobileclient", expectedId).Should(exists).Run().Test(t)
 			m.Args("delete", "client", expectedId).Should(NoErr).Run().Test(t)
 			m.Args("get", "client", expectedId).Should(notExists).Run().Test(t)

integration/flags.go

@@ -5,6 +5,6 @@ import (
 )
 
 var namespace = flag.String("namespace", "", "Openshift namespace (most often Project) to run our integration tests in")
-var prefix = flag.String("prefix", "", "Client name to be created")
+var prefix = flag.String("prefix", "test", "Client name to be created")
 var executable = flag.String("executable", "", "Executable under test")
 var update = flag.Bool("update", false, "update golden files")

integration/validatedCommandUtils.go

@@ -15,7 +15,7 @@ type ValidationResult struct {
 }
 
 func (v ValidationResult) Test(t *testing.T) (output []byte, err error) {
-	t.Log(fmt.Sprintf("%s\n", output))
+	t.Log(fmt.Sprintf("%s\n", v.Output))
 	if !v.Success {
 		t.Fatal(v.Message)
 	}
@@ -84,21 +84,21 @@ func All(vs ...ValidationFunction) ValidationFunction {
 }
 
 type CmdDesc struct {
-	executable string
+	Executable string
 	Arg        []string
 	Validator  ValidationFunction
 }
 
 func (c CmdDesc) Args(arg ...string) CmdDesc {
-	return CmdDesc{c.executable, append(c.Arg, arg...), c.Validator}
+	return CmdDesc{c.Executable, append(c.Arg, arg...), c.Validator}
 }
 
 func (c CmdDesc) Should(validator ValidationFunction) CmdDesc {
-	return CmdDesc{c.executable, c.Arg, All(c.Validator, validator)}
+	return CmdDesc{c.Executable, c.Arg, All(c.Validator, validator)}
 }
 
 func (c CmdDesc) Run() ValidationResult {
-	cmd := exec.Command(c.executable, c.Arg...)
+	cmd := exec.Command(c.Executable, c.Arg...)
 	output, err := cmd.CombinedOutput()
 	return c.Validator(output, err)
 }