Merge lp:~mathieu-lonjaret/gozk/zookeeper into lp:~juju/gozk/zk

[mpl]

package renaming tentative: zk -> zookeeper

updated the package names for the tests as well, as per Gustavo's comments.

https://codereview.appspot.com/5445048/

[Roger Peppe (rogpeppe)]

LGTM

On 28 November 2011 21:43, mpl <email address hidden> wrote:
> mpl has proposed merging lp:~mathieu-lonjaret/gozk/zookeeper into lp:gozk/zk.
>
> Requested reviews:
>  juju hackers (juju)
>
> For more details, see:
> https://code.launchpad.net/~mathieu-lonjaret/gozk/zookeeper/+merge/83695
>
> package renaming tentative: zk -> zookeeper
>
> I changed the package name, but I kept zk as the import alias in the tests,
> so that the calls would stay short and nice.
>
> https://codereview.appspot.com/5445048/
>
> --
> https://code.launchpad.net/~mathieu-lonjaret/gozk/zookeeper/+merge/83695
> Your team juju hackers is requested to review the proposed merge of lp:~mathieu-lonjaret/gozk/zookeeper into lp:gozk/zk.
>
> === modified file 'Makefile'
> --- Makefile    2011-09-24 14:00:23 +0000
> +++ Makefile    2011-11-28 21:42:24 +0000
> @@ -2,7 +2,7 @@
>
>  all: package
>
> -TARG=launchpad.net/gozk/zk
> +TARG=launchpad.net/gozk/zookeeper
>
>  GOFILES=\
>        server.go\
>
> === modified file 'retry_test.go'
> --- retry_test.go       2011-09-24 14:00:23 +0000
> +++ retry_test.go       2011-11-28 21:42:24 +0000
> @@ -2,7 +2,7 @@
>
>  import (
>        . "launchpad.net/gocheck"
> -       "launchpad.net/gozk/zk"
> +       zk "launchpad.net/gozk/zookeeper"
>        "os"
>  )
>
>
> === modified file 'server.go'
> --- server.go   2011-09-24 14:00:23 +0000
> +++ server.go   2011-11-28 21:42:24 +0000
> @@ -1,4 +1,4 @@
> -package zk
> +package zookeeper
>
>  import (
>        "bufio"
>
> === modified file 'suite_test.go'
> --- suite_test.go       2011-09-24 14:00:23 +0000
> +++ suite_test.go       2011-11-28 21:42:24 +0000
> @@ -5,7 +5,7 @@
>        "bufio"
>        "exec"
>        "fmt"
> -       "launchpad.net/gozk/zk"
> +       zk "launchpad.net/gozk/zookeeper"
>        "os"
>        "testing"
>        "time"
>
> === modified file 'zk.go'
> --- zk.go       2011-09-24 14:00:23 +0000
> +++ zk.go       2011-11-28 21:42:24 +0000
> @@ -6,7 +6,7 @@
>  //
>  // Written by Gustavo Niemeyer <email address hidden>
>  //
> -package zk
> +package zookeeper
>
>  /*
>  #cgo CFLAGS: -I/usr/include/c-client-src
>
> === modified file 'zk_test.go'
> --- zk_test.go  2011-09-24 14:00:23 +0000
> +++ zk_test.go  2011-11-28 21:42:24 +0000
> @@ -2,7 +2,7 @@
>
>  import (
>        . "launchpad.net/gocheck"
> -       "launchpad.net/gozk/zk"
> +       zk "launchpad.net/gozk/zookeeper"
>        "time"
>  )
>
>
>
>

[Gustavo Niemeyer (niemeyer)]

LGTM

Just one detail:

https://codereview.appspot.com/5445048/diff/1/zk_test.go
File zk_test.go (right):

https://codereview.appspot.com/5445048/diff/1/zk_test.go#newcode1
zk_test.go:1: package zk_test
The package name in all tests should be renamed to "zookeeper_test" as
well.

https://codereview.appspot.com/5445048/

[lp:~mathieu-lonjaret/gozk/zookeeper]

23. By mpl on 2011-11-29

fixing tests package name

[mpl (mathieu-lonjaret)]

Reviewers: mp+83695_code.launchpad.net, niemeyer,

Message:
Done.

On 2011/11/29 13:11:45, niemeyer wrote:
> LGTM

> Just one detail:

> https://codereview.appspot.com/5445048/diff/1/zk_test.go
> File zk_test.go (right):

> https://codereview.appspot.com/5445048/diff/1/zk_test.go#newcode1
> zk_test.go:1: package zk_test
> The package name in all tests should be renamed to "zookeeper_test" as
well.

Description:
updated the package names for the tests as well, as per Gustavo's
comments.

https://code.launchpad.net/~mathieu-lonjaret/gozk/zookeeper/+merge/83695

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/5445048/

Affected files:
   M Makefile
   M retry_test.go
   M server.go
   M suite_test.go
   M zk.go
   M zk_test.go

Index: Makefile
=== <email address hidden> >
<email address hidden>
=== modified file 'Makefile'
--- Makefile 2011-09-24 14:00:23 +0000
+++ Makefile 2011-11-28 21:30:01 +0000
@@ -2,7 +2,7 @@

  all: package

-TARG=launchpad.net/gozk/zk
+TARG=launchpad.net/gozk/zookeeper

  GOFILES=\
   server.go\

Index: retry_test.go
=== <email address hidden> >
<email address hidden>
=== modified file 'retry_test.go'
--- retry_test.go 2011-09-24 14:00:23 +0000
+++ retry_test.go 2011-11-29 13:55:45 +0000
@@ -1,8 +1,8 @@
-package zk_test
+package zookeeper_test

  import (
   . "launchpad.net/gocheck"
- "launchpad.net/gozk/zk"
+ zk "launchpad.net/gozk/zookeeper"
   "os"
  )

Index: server.go
=== <email address hidden> >
<email address hidden>
=== modified file 'server.go'
--- server.go 2011-09-24 14:00:23 +0000
+++ server.go 2011-11-28 21:30:01 +0000
@@ -1,4 +1,4 @@
-package zk
+package zookeeper

  import (
   "bufio"

Index: suite_test.go
=== <email address hidden> >
<email address hidden>
=== modified file 'suite_test.go'
--- suite_test.go 2011-09-24 14:00:23 +0000
+++ suite_test.go 2011-11-29 13:55:45 +0000
@@ -1,11 +1,11 @@
-package zk_test
+package zookeeper_test

  import (
   . "launchpad.net/gocheck"
   "bufio"
   "exec"
   "fmt"
- "launchpad.net/gozk/zk"
+ zk "launchpad.net/gozk/zookeeper"
   "os"
   "testing"
   "time"

Index: zk.go
=== <email address hidden> >
<email address hidden>
=== modified file 'zk.go'
--- zk.go 2011-09-24 14:00:23 +0000
+++ zk.go 2011-11-28 21:30:01 +0000
@@ -6,7 +6,7 @@
  //
  // Written by Gustavo Niemeyer <email address hidden>
  //
-package zk
+package zookeeper

  /*
  #cgo CFLAGS: -I/usr/include/c-client-src

Index: zk_test.go
=== <email address hidden> >
<email address hidden>
=== modified file 'zk_test.go'
--- zk_test.go 2011-09-24 14:00:23 +0000
+++ zk_test.go 2011-11-29 13:55:45 +0000
@@ -1,8 +1,8 @@
-package zk_test
+package zookeeper_test

  import (
   . "launchpad.net/gocheck"
- "launchpad.net/gozk/zk"
+ zk "launchpa...

[Gustavo Niemeyer (niemeyer)]

LGTM

Will get it merge, thanks a lot Mathieu.

https://codereview.appspot.com/5445048/

Unmerged revisions

23. By mpl on 2011-11-29

fixing tests package name

22. By mpl on 2011-11-28

package renaming: zk -> zookeeper

=== modified file 'Makefile'
--- Makefile	2011-09-24 14:00:23 +0000
+++ Makefile	2011-11-29 14:43:23 +0000
@@ -2,7 +2,7 @@
 
 all: package
 
-TARG=launchpad.net/gozk/zk
+TARG=launchpad.net/gozk/zookeeper
 
 GOFILES=\
 	server.go\

=== modified file 'retry_test.go'
--- retry_test.go	2011-09-24 14:00:23 +0000
+++ retry_test.go	2011-11-29 14:43:23 +0000
@@ -1,8 +1,8 @@
-package zk_test
+package zookeeper_test
 
 import (
 	. "launchpad.net/gocheck"
-	"launchpad.net/gozk/zk"
+	zk "launchpad.net/gozk/zookeeper"
 	"os"
 )
 

=== modified file 'server.go'
--- server.go	2011-09-24 14:00:23 +0000
+++ server.go	2011-11-29 14:43:23 +0000
@@ -1,4 +1,4 @@
-package zk
+package zookeeper
 
 import (
 	"bufio"

=== modified file 'suite_test.go'
--- suite_test.go	2011-09-24 14:00:23 +0000
+++ suite_test.go	2011-11-29 14:43:23 +0000
@@ -1,11 +1,11 @@
-package zk_test
+package zookeeper_test
 
 import (
 	. "launchpad.net/gocheck"
 	"bufio"
 	"exec"
 	"fmt"
-	"launchpad.net/gozk/zk"
+	zk "launchpad.net/gozk/zookeeper"
 	"os"
 	"testing"
 	"time"

=== modified file 'zk.go'
--- zk.go	2011-09-24 14:00:23 +0000
+++ zk.go	2011-11-29 14:43:23 +0000
@@ -6,7 +6,7 @@
 //
 // Written by Gustavo Niemeyer <[e-mail]>
 //
-package zk
+package zookeeper
 
 /*
 #cgo CFLAGS: -I/usr/include/c-client-src

=== modified file 'zk_test.go'
--- zk_test.go	2011-09-24 14:00:23 +0000
+++ zk_test.go	2011-11-29 14:43:23 +0000
@@ -1,8 +1,8 @@
-package zk_test
+package zookeeper_test
 
 import (
 	. "launchpad.net/gocheck"
-	"launchpad.net/gozk/zk"
+	zk "launchpad.net/gozk/zookeeper"
 	"time"
 )