Merge lp:~elopio/snappy-tests-job/arch into lp:~fgimenez/snappy-tests-job/trunk

[Leo Arias]

Added the arch flag.

I don't link this runner test because we are basically writing the same command building method. I would prefer to just hardcode the expected cmd string in each test. But I'll leave that to the future :)

[Federico Gimenez (fgimenez)]

Ok thanks!

review: Approve

=== modified file 'runner/runner.go'
--- runner/runner.go	2015-08-07 09:29:03 +0000
+++ runner/runner.go	2015-08-13 15:58:49 +0000
@@ -35,7 +35,7 @@
 
 // Runner is the test runner type
 type Runner interface {
-	RunTests(path, cmdTpl, ip string, fromBranch bool) error
+	RunTests(path, cmdTpl, ip, arch 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 string, fromBranch bool) (err error) {
+func (r *BasicRunnerHandler) RunTests(path, cmdTpl, ip, arch string, fromBranch bool) (err error) {
 	goPath := determineGoPath(path)
 
 	log.Print("*** Installing godeps ***")
@@ -68,16 +68,19 @@
 		return
 	}
 
-	return r.runTests(path, goPath, cmdTpl, ip, fromBranch)
+	return r.runTests(path, goPath, cmdTpl, ip, arch, fromBranch)
 }
 
-func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip string, fromBranch bool) (err error) {
-	var snappyFromBranch string
+func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip, arch string, fromBranch bool) (err error) {
+	var args []string
+	if arch != "" {
+		args = append(args, "-arch "+arch)
+	}
 	if fromBranch {
-		snappyFromBranch = "-snappy-from-branch"
+		args = append(args, "-snappy-from-branch")
 	}
 
-	cmd := fmt.Sprintf(cmdTpl, ip, snappyFromBranch)
+	cmd := fmt.Sprintf(cmdTpl, ip, strings.Join(args, " "))
 
 	log.Printf("*** Running tests with command %s in %s ***", cmd, path)
 

=== modified file 'runner/runner_test.go'
--- runner/runner_test.go	2015-08-07 09:29:03 +0000
+++ runner/runner_test.go	2015-08-13 15:58:49 +0000
@@ -37,6 +37,7 @@
 	fakeUtil   *testhelpers.FakeUtils
 	subject    Runner
 	ip         string
+	arch       string
 	path       string
 	goPath     string
 	cmdTpl     string
@@ -63,15 +64,15 @@
 }
 
 func (s *runnerSuite) TestRunCallRunTestsCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.fromBranch)
 
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.goPath, false)
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, false)
 	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.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.fromBranch)
 
 	installGodepCmd := installGodepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installGodepCmd], check.Equals, 1,
@@ -79,7 +80,7 @@
 }
 
 func (s *runnerSuite) TestRunCallInstallDependenciesCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.fromBranch)
 
 	installDepCmd := installDepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installDepCmd], check.Equals, 1,
@@ -89,27 +90,39 @@
 func (s *runnerSuite) TestRunReturnError(c *check.C) {
 	s.fakeUtil.FailExec = true
 
-	err := s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.fromBranch)
+	err := s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, 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, fromBranch)
-
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.goPath, fromBranch)
-	c.Assert(s.fakeUtil.ExecCalls[runCmd], check.Equals, 1,
-		check.Commentf("The command %s was not called", runCmd))
-}
-
-func runCmd(path, cmdTpl, ip, goPath string, fromBranch bool) string {
-	var snappyFromBranch string
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, fromBranch)
+
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, fromBranch)
+	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.fromBranch)
+
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, arch, s.goPath, s.fromBranch)
+	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 string, fromBranch bool) string {
+	var args []string
+	if arch != "" {
+		args = append(args, "-arch "+arch)
+	}
 	if fromBranch {
-		snappyFromBranch = "-snappy-from-branch"
+		args = append(args, "-snappy-from-branch")
 	}
 
-	cmd := fmt.Sprintf(cmdTpl, ip, snappyFromBranch)
+	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()

=== modified file 'snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-08-13 05:32:23 +0000
+++ snappy-tests-job/main.go	2015-08-13 15:58:49 +0000
@@ -44,6 +44,8 @@
 	var (
 		useSnappyFromBranch = flag.Bool("snappy-from-branch", false,
 			"If this flag is used, snappy will be compiled from this branch, copied to the testbed and used for the tests. Otherwise, the snappy installed with the image will be used.")
+		arch = flag.String("arch", "",
+			"Architecture of the test bed. Defaults to use the same architecture as the host.")
 		ip = flag.String("ip", "",
 			"IP of the testbed. If no IP is passed, a cloud instance will be started for the test.")
 		cloudProvider = flag.String("cloud", defaultCloudProvider,
@@ -89,7 +91,7 @@
 	}
 
 	testRunner := runner.NewBasicRunnerHandler(utilHandler)
-	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *useSnappyFromBranch); err != nil {
+	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *arch, *useSnappyFromBranch); err != nil {
 		log.Panic("Error from test runner")
 	}
 }