Merge lp:~fgimenez/snappy-tests-job/test-build-tags into lp:snappy-tests-job

[Federico Gimenez]

Added testBuildTags flag

Added testBuildTags flag

Also changed the test a bit, it had an exact copy of a production code function, those test passing weren't giving to much value.

[Leo Arias (elopio)]

great change in the test, thanks :)
This needs to wait for the addition of the flag in the other project.

review: Approve

[Federico Gimenez (fgimenez)]

Thanks Leo! It can be landed now, the flag will be accessible and we can use it as needed

=== modified file 'runner/runner.go'
--- runner/runner.go	2015-11-04 16:18:48 +0000
+++ runner/runner.go	2015-11-24 12:29:14 +0000
@@ -35,7 +35,7 @@
 
 // Runner is the test runner type
 type Runner interface {
-	RunTests(path, cmdTpl, ip, arch, outputDir string, fromBranch bool) error
+	RunTests(path, cmdTpl, ip, arch, outputDir, testBuildTags string, fromBranch bool) error
 }
 
 // BasicRunnerHandler is a basic type implementing Runner
@@ -51,7 +51,7 @@
 // RunTests executes the given command in the given path. The command is formed
 // by interpolating the ip in the cmdTpl; before it installs godeps and the
 // required dependencies
-func (r *BasicRunnerHandler) RunTests(path, cmdTpl, ip, arch, outputDir string, fromBranch bool) (err error) {
+func (r *BasicRunnerHandler) RunTests(path, cmdTpl, ip, arch, outputDir, testBuildTags string, fromBranch bool) (err error) {
 	goPath := determineGoPath(path)
 
 	log.Print("*** Installing godeps ***")
@@ -68,10 +68,10 @@
 		return
 	}
 
-	return r.runTests(path, goPath, cmdTpl, ip, arch, outputDir, fromBranch)
+	return r.runTests(path, goPath, cmdTpl, ip, arch, outputDir, testBuildTags, fromBranch)
 }
 
-func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip, arch, outputDir string, fromBranch bool) (err error) {
+func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip, arch, outputDir, testBuildTags string, fromBranch bool) (err error) {
 	var args []string
 	if arch != "" {
 		args = append(args, "-arch "+arch)
@@ -82,6 +82,9 @@
 	if fromBranch {
 		args = append(args, "-snappy-from-branch")
 	}
+	if testBuildTags != "" {
+		args = append(args, "-test-build-tags "+testBuildTags)
+	}
 
 	cmd := fmt.Sprintf(cmdTpl, ip, strings.Join(args, " "))
 

=== modified file 'runner/runner_test.go'
--- runner/runner_test.go	2015-09-02 03:49:52 +0000
+++ runner/runner_test.go	2015-11-24 12:29:14 +0000
@@ -25,7 +25,7 @@
 	"strings"
 	"testing"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 
 	"launchpad.net/snappy-tests-job/testhelpers"
 	"launchpad.net/snappy-tests-job/utils"
@@ -34,15 +34,16 @@
 var _ = check.Suite(&runnerSuite{})
 
 type runnerSuite struct {
-	fakeUtil   *testhelpers.FakeUtils
-	subject    Runner
-	ip         string
-	arch       string
-	path       string
-	goPath     string
-	cmdTpl     string
-	fromBranch bool
-	outputDir  string
+	fakeUtil      *testhelpers.FakeUtils
+	subject       Runner
+	ip            string
+	arch          string
+	path          string
+	goPath        string
+	cmdTpl        string
+	fromBranch    bool
+	outputDir     string
+	testBuildTags string
 }
 
 func Test(t *testing.T) { check.TestingT(t) }
@@ -65,15 +66,16 @@
 }
 
 func (s *runnerSuite) TestRunCallRunTestsCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.testBuildTags, s.fromBranch)
 
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, s.outputDir, false)
+	runCmd := "go run " + s.ip + " # executed in " + s.path + " with pipe and env GOPATH=" + s.goPath
+	fmt.Println(runCmd)
 	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
 		check.Commentf("The command %s was not called", runCmd))
 }
 
 func (s *runnerSuite) TestRunCallInstallGodepsCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.testBuildTags, s.fromBranch)
 
 	installGodepCmd := installGodepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installGodepCmd], check.Equals, 1,
@@ -81,7 +83,7 @@
 }
 
 func (s *runnerSuite) TestRunCallInstallDependenciesCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.testBuildTags, s.fromBranch)
 
 	installDepCmd := installDepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installDepCmd], check.Equals, 1,
@@ -91,54 +93,46 @@
 func (s *runnerSuite) TestRunReturnError(c *check.C) {
 	s.fakeUtil.FailExec = true
 
-	err := s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
+	err := s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.testBuildTags, s.fromBranch)
 
 	c.Assert(err, check.NotNil, check.Commentf("Expected error not returned by Runner.RunTests"))
 }
 
 func (s *runnerSuite) TestRunCallRunTestsFromBranchCommand(c *check.C) {
 	fromBranch := true
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, fromBranch)
-
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, s.outputDir, fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.testBuildTags, fromBranch)
+
+	runCmd := "go run " + s.ip + " -snappy-from-branch # executed in " + s.path + " with pipe and env GOPATH=" + s.goPath
+
 	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
 		check.Commentf("The command %s was not called", runCmd))
 }
 
 func (s *runnerSuite) TestRunCallRunTestsWithArchCommand(c *check.C) {
 	arch := "testarch"
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, arch, s.outputDir, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, arch, s.outputDir, s.testBuildTags, s.fromBranch)
 
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, arch, s.goPath, s.outputDir, s.fromBranch)
+	runCmd := "go run " + s.ip + " -arch " + arch + " # executed in " + s.path + " with pipe and env GOPATH=" + s.goPath
 	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
 		check.Commentf("The command %s was not called", runCmd))
 }
 
 func (s *runnerSuite) TestRunCallRunTestsWithOutputDirCommand(c *check.C) {
 	outputDir := "/tmp/test-output-dir"
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, outputDir, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, outputDir, s.testBuildTags, s.fromBranch)
 
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, outputDir, s.fromBranch)
+	runCmd := "go run " + s.ip + " -output-dir " + outputDir + " # executed in " + s.path + " with pipe and env GOPATH=" + s.goPath
 	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
 		check.Commentf("The command %s was not called", runCmd))
 }
 
-func runCmd(path, cmdTpl, ip, arch, goPath, outputDir string, fromBranch bool) string {
-	var args []string
-	if arch != "" {
-		args = append(args, "-arch "+arch)
-	}
-	if outputDir != "" {
-		args = append(args, "-output-dir "+outputDir)
-	}
-	if fromBranch {
-		args = append(args, "-snappy-from-branch")
-	}
+func (s *runnerSuite) TestRunCallRunTestsWithTestBuildTags(c *check.C) {
+	testBuildTags := "mytestbuildtags"
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, testBuildTags, s.fromBranch)
 
-	cmd := fmt.Sprintf(cmdTpl, ip, strings.Join(args, " "))
-	params := utils.NewExecCommandParams(path, strings.Fields(cmd), true)
-	params.AppendEnv(fmt.Sprintf("GOPATH=%s", goPath))
-	return params.String()
+	runCmd := "go run " + s.ip + " -test-build-tags " + testBuildTags + " # executed in " + s.path + " with pipe and env GOPATH=" + s.goPath
+	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
+		check.Commentf("The command %s was not called", runCmd))
 }
 
 func installGodepCmd(path, goPath string) string {

=== modified file 'snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-11-05 09:39:17 +0000
+++ snappy-tests-job/main.go	2015-11-24 12:29:14 +0000
@@ -61,6 +61,7 @@
 			"Repository from which to get the source code, defaults to "+defaultRepo)
 		src = flag.String("src", defaultBranch,
 			"Branch from which to get the source code, defaults to "+defaultBranch)
+		testBuildTags = flag.String("test-build-tags", "", "Build constraints to be be passed to the test build command")
 
 		commandTpl = flag.String("command", defaultCommandTpl,
 			"Command template, should include the testBed ip as %s, defaults to '"+defaultCommandTpl+"'")
@@ -94,7 +95,7 @@
 	}
 
 	testRunner := runner.NewBasicRunnerHandler(utilHandler)
-	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *arch, *outputDir, *useSnappyFromBranch); err != nil {
+	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *arch, *outputDir, *testBuildTags, *useSnappyFromBranch); err != nil {
 		log.Panic("Error from test runner")
 	}
 }