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

[Leo Arias]

Added a target flag to merge the source before running the tests.

[Leo Arias (elopio)]

I added tests and tried it. Self-approving to give it a go in jenkins.

review: Approve

=== modified file 'snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-08-21 02:40:46 +0000
+++ snappy-tests-job/main.go	2015-08-21 04:29:18 +0000
@@ -58,6 +58,8 @@
 			"Channel of the image, defaults to "+defaultChannel)
 		src = flag.String("src", defaultSrc,
 			"Branch from which to get the source code, defaults to "+defaultSrc)
+		target = flag.String("target", "",
+			"Target branch to be merged with the src branch, defaults to not merging src with any branch")
 
 		commandTpl = flag.String("command", defaultCommandTpl,
 			"Command template, should include the testBed ip as %s, defaults to '"+defaultCommandTpl+"'")
@@ -68,7 +70,13 @@
 	// TODO: we need a waitGroup here to run things more efficiently
 	utilHandler := utils.NewBasicHandler()
 	sourceHandler := source.NewBzrHandler(utilHandler)
-	sourcePath, err := sourceHandler.Get(*src)
+	var err error
+	var sourcePath string
+	if *target == "" {
+		sourcePath, err = sourceHandler.Get(*src)
+	} else {
+		sourcePath, err = sourceHandler.Merge(*src, *target)
+	}
 	if err != nil {
 		log.Panicf("Error getting %s into %s", *src, sourcePath)
 	}
 
=== modified file 'source/source.go'
--- source/source.go	2015-08-21 02:21:02 +0000
+++ source/source.go	2015-08-21 04:29:18 +0000
@@ -37,6 +37,7 @@
 // Sourcer is the interface satisfied by all the source handlers
 type Sourcer interface {
 	Get(string) (string, error)
+	Merge(string, string) (string, error)
 }
 
 // BzrHandler is a source handler for bazaar
@@ -60,6 +61,17 @@
 	return filepath.Join(path, targetSubdir), err
 }
 
+// Merge merges two branches and returns the path to the merged source.
+func (handler *BzrHandler) Merge(source string, target string) (string, error) {
+	path, err := handler.Get(target)
+	if err == nil {
+		log.Printf("*** Merging %s with %s ***", target, source)
+		params := utils.NewExecCommandParams(path, []string{"bzr", "merge", source}, true)
+		_, err = handler.util.ExecCommand(params)
+	}
+	return path, err
+}
+
 // NewBzrHandler returns a pointer to a new bzr source handler
 func NewBzrHandler(util utils.Utilizer) *BzrHandler {
 	return &BzrHandler{util: util}
 
=== modified file 'source/source_test.go'
--- source/source_test.go	2015-08-21 02:20:10 +0000
+++ source/source_test.go	2015-08-21 04:29:18 +0000
@@ -32,6 +32,7 @@
 )
 
 const testRepo = "lp:snappy"
+const testSource = "lp:~snappy-dev/snappy/test-branch"
 
 var _ = check.Suite(&sourceSuite{})
 
@@ -91,6 +92,25 @@
 			s.fakeUtil.ExecCalls[pullCmd]))
 }
 
+func (s *sourceSuite) TestMergeCallsGetAndMergeCommand(c *check.C) {
+	s.subject.Merge(testSource, testRepo)
+
+	pullCmd := pullCmd()
+	c.Check(s.fakeUtil.ExecCalls[pullCmd], check.Equals, 1,
+		check.Commentf("The pull command %s was not called", pullCmd))
+	mergeCmd := mergeCmd()
+	c.Check(s.fakeUtil.ExecCalls[mergeCmd], check.Equals, 1,
+		check.Commentf("The merge command %s was not called", mergeCmd))
+}
+
+func (s *sourceSuite) TestMergeReturnValue(c *check.C) {
+	path, err := s.subject.Merge(testSource, testRepo)
+	expected := expectedReturnPath()
+
+	c.Assert(path, check.Equals, expected, check.Commentf("Unexpected return value path %s", path))
+	c.Assert(err, check.IsNil, check.Commentf("Unexpected return error %s", err))
+}
+
 func expectedBasePath() string {
 	return filepath.Join(targetPath, strconv.Itoa(os.Getpid()), basePkg)
 }
@@ -103,3 +123,8 @@
 	params := utils.NewExecCommandParams(expectedBasePath(), []string{"bzr", "branch", testRepo, targetSubdir}, true)
 	return params.String()
 }
+
+func mergeCmd() string {
+	params := utils.NewExecCommandParams(expectedReturnPath(), []string{"bzr", "merge", testSource}, true)
+	return params.String()
+}