Merge lp:~elopio/snappy-tests-job/output_dir into lp:snappy-tests-job

[Leo Arias]

Added the output dir as an optional parameter.

Requires https://code.launchpad.net/~elopio/snappy/integration_output/+merge/269830 to land first.

[lp:~elopio/snappy-tests-job/output_dir]

65. By Leo Arias on 2015-09-02

Added a test.

[Federico Gimenez (fgimenez)]

Works great, thanks! :)

review: Approve

=== modified file 'runner/runner.go'
--- runner/runner.go	2015-08-13 15:56:06 +0000
+++ runner/runner.go	2015-09-02 03:56:45 +0000
@@ -35,7 +35,7 @@
 
 // Runner is the test runner type
 type Runner interface {
-	RunTests(path, cmdTpl, ip, arch string, fromBranch bool) error
+	RunTests(path, cmdTpl, ip, arch, outputDir 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 string, fromBranch bool) (err error) {
+func (r *BasicRunnerHandler) RunTests(path, cmdTpl, ip, arch, outputDir string, fromBranch bool) (err error) {
 	goPath := determineGoPath(path)
 
 	log.Print("*** Installing godeps ***")
@@ -68,14 +68,17 @@
 		return
 	}
 
-	return r.runTests(path, goPath, cmdTpl, ip, arch, fromBranch)
+	return r.runTests(path, goPath, cmdTpl, ip, arch, outputDir, fromBranch)
 }
 
-func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip, arch string, fromBranch bool) (err error) {
+func (r *BasicRunnerHandler) runTests(path, goPath, cmdTpl, ip, arch, outputDir string, fromBranch bool) (err error) {
 	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")
 	}
 
=== modified file 'runner/runner_test.go'
--- runner/runner_test.go	2015-08-13 15:56:06 +0000
+++ runner/runner_test.go	2015-09-02 03:56:45 +0000
@@ -42,6 +42,7 @@
 	goPath     string
 	cmdTpl     string
 	fromBranch bool
+	outputDir  string
 }
 
 func Test(t *testing.T) { check.TestingT(t) }
@@ -64,15 +65,15 @@
 }
 
 func (s *runnerSuite) TestRunCallRunTestsCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
 
-	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, false)
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, s.outputDir, 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.arch, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
 
 	installGodepCmd := installGodepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installGodepCmd], check.Equals, 1,
@@ -80,7 +81,7 @@
 }
 
 func (s *runnerSuite) TestRunCallInstallDependenciesCommand(c *check.C) {
-	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.fromBranch)
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, s.fromBranch)
 
 	installDepCmd := installDepCmd(s.path, s.goPath)
 	c.Assert(s.fakeUtil.ExecCalls[installDepCmd], check.Equals, 1,
@@ -90,34 +91,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.fromBranch)
+	err := s.subject.RunTests(s.path, s.cmdTpl, s.ip, s.arch, s.outputDir, 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, fromBranch)
+	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, fromBranch)
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, s.outputDir, 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 {
+	s.subject.RunTests(s.path, s.cmdTpl, s.ip, arch, s.outputDir, s.fromBranch)
+
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, arch, s.goPath, s.outputDir, s.fromBranch)
+	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)
+
+	runCmd := runCmd(s.path, s.cmdTpl, s.ip, s.arch, s.goPath, outputDir, 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, 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")
 	}
 
=== modified file 'snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-08-21 04:32:13 +0000
+++ snappy-tests-job/main.go	2015-09-02 03:56:45 +0000
@@ -46,7 +46,8 @@
 			"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", "",
+		outputDir = flag.String("output-dir", "", "Directory where test artifacts will be stored.")
+		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,
 			"Cloud provider to use, defaults to "+defaultCloudProvider)
@@ -99,7 +100,7 @@
 	}
 
 	testRunner := runner.NewBasicRunnerHandler(utilHandler)
-	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *arch, *useSnappyFromBranch); err != nil {
+	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *arch, *outputDir, *useSnappyFromBranch); err != nil {
 		log.Panic("Error from test runner")
 	}
 }