Merge lp:~dave-cheney/goose/goose into lp:goose

[Dave Cheney]

Fix assignment to private struct member

This was detected by the Go 1.2 compiler, but is an issue regardless of compiler or revision. The core problem was assignment to a private struct member in a different package.

https://codereview.appspot.com/31890043/

Fix assignment to private struct member

This was detected by the Go 1.2 compiler, but is an issue regardless of compiler or revision. The core problem was assignment to a private struct member in a different package.

https://codereview.appspot.com/31890043/

[John A Meinel (jameinel)]

LGTM

review: Approve

[Michael Hudson-Doyle (mwhudson)]

I saw this too, thanks for fixing it. I guess it's a gccgo bug that this
not rejected by gccgo tip?

[Dave Cheney (dave-cheney)]

Ohh, good point. I'll raise this with the gccgo devs.

On Mon, Nov 25, 2013 at 5:30 PM, Michael Hudson-Doyle
<email address hidden> wrote:
> I saw this too, thanks for fixing it. I guess it's a gccgo bug that this
> not rejected by gccgo tip?
>
> --
> https://code.launchpad.net/~dave-cheney/goose/goose/+merge/196471
> You are the owner of lp:~dave-cheney/goose/goose.

[Dave Cheney (dave-cheney)]

Ping. Prereq has been merged, this fixes the invalid assignment of a private member field.

[Michael Hudson-Doyle (mwhudson)]

Looks sane to me!

review: Approve

[Dave Cheney (dave-cheney)]

Now all the tests pass on go1.2rc5 (trunk) and gccgo

On Tue, Nov 26, 2013 at 12:04 PM, Michael Hudson-Doyle
<email address hidden> wrote:
> Review: Approve
>
> Looks sane to me!
> --
> https://code.launchpad.net/~dave-cheney/goose/goose/+merge/196471
> You are the owner of lp:~dave-cheney/goose/goose.

[Dave Cheney (dave-cheney)]

Please take a look.

https://codereview.appspot.com/31890043/

Unmerged revisions

129. By Dave Cheney on 2014-09-08

revert change

128. By Dave Cheney on 2014-09-08

goose/testservices: fix test under gccgo

Make the test hook service work reliably for the latest change in underfined gccgo behavior

=== modified file 'nova/local_test.go'
--- nova/local_test.go	2013-06-24 04:26:54 +0000
+++ nova/local_test.go	2013-11-26 00:58:30 +0000
@@ -2,7 +2,6 @@
 
 import (
 	"bytes"
-	"fmt"
 	. "launchpad.net/gocheck"
 	"launchpad.net/goose/client"
 	"launchpad.net/goose/errors"
@@ -102,7 +101,7 @@
 		sendError := s.retryErrorCount < s.retryErrorCountToSend
 		if sendError {
 			s.retryErrorCount++
-			return &testservices.RateLimitExceededError{fmt.Errorf("retry limit exceeded")}
+			return testservices.RateLimitExceededError
 		}
 		return nil
 	}

=== modified file 'testservices/novaservice/service_http.go'
--- testservices/novaservice/service_http.go	2013-06-22 11:39:35 +0000
+++ testservices/novaservice/service_http.go	2013-11-26 00:58:30 +0000
@@ -297,7 +297,7 @@
 		return
 	}
 	var resp http.Handler
-	if _, ok := err.(*testservices.RateLimitExceededError); ok {
+	if err == testservices.RateLimitExceededError {
 		resp = errRateLimitExceeded
 	} else if err == testservices.NoMoreFloatingIPs {
 		resp = errNoMoreFloatingIPs

=== modified file 'testservices/service.go'
--- testservices/service.go	2013-09-04 09:50:54 +0000
+++ testservices/service.go	2013-11-26 00:58:30 +0000
@@ -26,9 +26,7 @@
 
 // Internal Openstack errors.
 
-type RateLimitExceededError struct {
-	error
-}
+var RateLimitExceededError = errors.New("retry limit exceeded")
 
 // NoMoreFloatingIPs corresponds to "HTTP 404 Zero floating ips available."
 var NoMoreFloatingIPs = errors.New("zero floating ips available")