snappy-tests-job

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

  1. get_branch
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Leo Arias
Approved revision: 62
Merged at revision: 60
Proposed branch: lp:~elopio/snappy-tests-job/get_branch
Merge into: lp:snappy-tests-job
Diff against target: 84 lines (+12/-12)
3 files modified
snappy-tests-job/main.go (+1/-1)
source/source.go (+3/-3)
source/source_test.go (+8/-8)
To merge this branch: bzr merge lp:~elopio/snappy-tests-job/get_branch
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Review via email: mp+268688@code.launchpad.net

This proposal supersedes a proposal from 2015-08-21.

Commit message

Renamed Run to Get in the source interface.

Description of the change

I'm adding a Merge func to the interface, and I thought that Run is not as accurate as Get. So I'm renaming it here.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

Self-approving because Federico is living la vida loca. All the unit tests pass. There's a bug with the default branch that I'll fix in another branch.

review: Approve
Revision history for this message
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal
Download full text (4.1 KiB)

On Thu, Aug 20, 2015 at 7:36 PM, Leo Arias <email address hidden> wrote:

> Leo Arias has proposed merging lp:~elopio/snappy-tests-job/get_branch into
> lp:~fgimenez/snappy-tests-job/trunk.
>
> Commit message:
> Renamed Run to Get in the source interface.
>

A rationale here would be good.

>
> Requested reviews:
> Snappy Developers (snappy-dev)
>
> For more details, see:
>
> https://code.launchpad.net/~elopio/snappy-tests-job/get_branch/+merge/268687
>
> I'm adding a Merge func to the interface, and I thought that Run is not as
> accurate as Get. So I'm renaming it here.
> --
> Your team Snappy Developers is requested to review the proposed merge of
> lp:~elopio/snappy-tests-job/get_branch into
> lp:~fgimenez/snappy-tests-job/trunk.
>
> Launchpad-Message-Rationale: Reviewer @snappy-dev
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~elopio/snappy-tests-job/get_branch
> Launchpad-Project: snappy-tests-job
>
> === modified file 'snappy-tests-job/main.go'
> --- snappy-tests-job/main.go 2015-08-13 15:56:06 +0000
> +++ snappy-tests-job/main.go 2015-08-21 02:35:42 +0000
> @@ -68,7 +68,7 @@
> // TODO: we need a waitGroup here to run things more efficiently
> utilHandler := utils.NewBasicHandler()
> sourceHandler := source.NewBzrHandler(utilHandler)
> - sourcePath, err := sourceHandler.Run(*src)
> + sourcePath, err := sourceHandler.Get(*src)
> if err != nil {
> log.Panicf("Error getting %s into %s", *src, sourcePath)
> }
>
> === modified file 'source/source.go'
> --- source/source.go 2015-07-24 15:28:01 +0000
> +++ source/source.go 2015-08-21 02:35:42 +0000
> @@ -36,7 +36,7 @@
>
> // Sourcer is the interface satisfied by all the source handlers
> type Sourcer interface {
> - Run(string) (string, error)
> + Get(string) (string, error)
> }
>
> // BzrHandler is a source handler for bazaar
> @@ -44,8 +44,8 @@
> util utils.Utilizer
> }
>
> -// Run is the method for getting the source code
> -func (handler *BzrHandler) Run(repo string) (string, error) {
> +// Get is the method for getting the source code
> +func (handler *BzrHandler) Get(repo string) (string, error) {
> path := filepath.Join(targetPath, strconv.Itoa(os.Getpid()),
> basePkg)
>
> log.Printf("*** Branching %s in %s ***", repo, path)
>
> === modified file 'source/source_test.go'
> --- source/source_test.go 2015-07-24 09:59:38 +0000
> +++ source/source_test.go 2015-08-21 02:35:42 +0000
> @@ -54,8 +54,8 @@
> check.Commentf("Expected type Sourcer, got %T", s.subject))
> }
>
> -func (s *sourceSuite) TestRunCreatesTargetPath(c *check.C) {
> - s.subject.Run(testRepo)
> +func (s *sourceSuite) TestGetCreatesTargetPath(c *check.C) {
> + s.subject.Get(testRepo)
>
> expected := expectedBasePath()
>
> @@ -63,26 +63,26 @@
> check.Commentf("The target directory %s was not created",
> expected))
> }
>
> -func (s *sourceSuite) TestRunCallsBranchCommand(c *check.C) {
> - s.subject.Run(testRepo)
> +func (s *sourceSuite) TestGetCallsBranchCommand(c *check.C) {
> + s.subject.Get(testRepo)
>
> ...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy-tests-job/main.go'
2--- snappy-tests-job/main.go 2015-08-13 15:56:06 +0000
3+++ snappy-tests-job/main.go 2015-08-21 02:36:01 +0000
4@@ -68,7 +68,7 @@
5 // TODO: we need a waitGroup here to run things more efficiently
6 utilHandler := utils.NewBasicHandler()
7 sourceHandler := source.NewBzrHandler(utilHandler)
8- sourcePath, err := sourceHandler.Run(*src)
9+ sourcePath, err := sourceHandler.Get(*src)
10 if err != nil {
11 log.Panicf("Error getting %s into %s", *src, sourcePath)
12 }
13
14=== modified file 'source/source.go'
15--- source/source.go 2015-07-24 15:28:01 +0000
16+++ source/source.go 2015-08-21 02:36:01 +0000
17@@ -36,7 +36,7 @@
18
19 // Sourcer is the interface satisfied by all the source handlers
20 type Sourcer interface {
21- Run(string) (string, error)
22+ Get(string) (string, error)
23 }
24
25 // BzrHandler is a source handler for bazaar
26@@ -44,8 +44,8 @@
27 util utils.Utilizer
28 }
29
30-// Run is the method for getting the source code
31-func (handler *BzrHandler) Run(repo string) (string, error) {
32+// Get is the method for getting the source code
33+func (handler *BzrHandler) Get(repo string) (string, error) {
34 path := filepath.Join(targetPath, strconv.Itoa(os.Getpid()), basePkg)
35
36 log.Printf("*** Branching %s in %s ***", repo, path)
37
38=== modified file 'source/source_test.go'
39--- source/source_test.go 2015-07-24 09:59:38 +0000
40+++ source/source_test.go 2015-08-21 02:36:01 +0000
41@@ -54,8 +54,8 @@
42 check.Commentf("Expected type Sourcer, got %T", s.subject))
43 }
44
45-func (s *sourceSuite) TestRunCreatesTargetPath(c *check.C) {
46- s.subject.Run(testRepo)
47+func (s *sourceSuite) TestGetCreatesTargetPath(c *check.C) {
48+ s.subject.Get(testRepo)
49
50 expected := expectedBasePath()
51
52@@ -63,26 +63,26 @@
53 check.Commentf("The target directory %s was not created", expected))
54 }
55
56-func (s *sourceSuite) TestRunCallsBranchCommand(c *check.C) {
57- s.subject.Run(testRepo)
58+func (s *sourceSuite) TestGetCallsBranchCommand(c *check.C) {
59+ s.subject.Get(testRepo)
60
61 pullCmd := pullCmd()
62 c.Assert(s.fakeUtil.ExecCalls[pullCmd], check.Equals, 1,
63 check.Commentf("The pull command %s was not called", pullCmd))
64 }
65
66-func (s *sourceSuite) TestRunReturnValue(c *check.C) {
67- path, err := s.subject.Run(testRepo)
68+func (s *sourceSuite) TestGetReturnValue(c *check.C) {
69+ path, err := s.subject.Get(testRepo)
70 expected := expectedReturnPath()
71
72 c.Assert(path, check.Equals, expected, check.Commentf("Unexpected return value path %s", path))
73 c.Assert(err, check.IsNil, check.Commentf("Unexpected return error %s", err))
74 }
75
76-func (s *sourceSuite) TestRunDoesNotCallBranchCommandOnError(c *check.C) {
77+func (s *sourceSuite) TestGetDoesNotCallBranchCommandOnError(c *check.C) {
78 s.fakeUtil.FailMkDir = true
79
80- s.subject.Run(testRepo)
81+ s.subject.Get(testRepo)
82
83 pullCmd := pullCmd()
84 c.Assert(s.fakeUtil.ExecCalls[pullCmd], check.Equals, 0,

Subscribers

People subscribed via source and target branches

to all changes: