Merge lp:~axwalk/juju-core/replicaset-test-race into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

replicaset: fix race/nil pointer deref in test

If CurrentStatus returns an error but there are
still more attempts, then the test continues on
and refers to a nil result.

replicaset: fix race/nil pointer deref in test

If CurrentStatus returns an error but there are
still more attempts, then the test continues on
and refers to a nil result.

As seen in:
https://code.launchpad.net/~axwalk/juju-core/local-provider-testability/+merge/204169/comments/482324

https://codereview.appspot.com/62040043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+205900_code.launchpad.net,

Message:
Please take a look.

Description:
replicaset: fix race/nil pointer deref in test

If CurrentStatus returns an error but there are
still more attempts, then the test continues on
and refers to a nil result.

As seen in:
https://code.launchpad.net/~axwalk/juju-core/local-provider-testability/+merge/204169/comments/482324

https://code.launchpad.net/~axwalk/juju-core/replicaset-test-race/+merge/205900

(do not edit description out of merge proposal)

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

Affected files (+10, -4 lines):
   A [revision details]
   M replicaset/replicaset_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140211064343-d5yn0b3om93nuecj
+New revision: <email address hidden>

Index: replicaset/replicaset_test.go
=== modified file 'replicaset/replicaset_test.go'
--- replicaset/replicaset_test.go 2014-01-13 21:18:11 +0000
+++ replicaset/replicaset_test.go 2014-02-12 05:20:21 +0000
@@ -348,10 +348,14 @@
   for attempt.Next() {
    var err error
    res, err = CurrentStatus(session)
-
- if err != nil && !attempt.HasNext() {
- c.Errorf("Couldn't get status before timeout, got err: %v", err)
- return
+ if err != nil {
+ if !attempt.HasNext() {
+ c.Errorf("Couldn't get status before timeout, got err: %v", err)
+ return
+ } else {
+ // try again
+ continue
+ }
    }

    if res.Members[0].State == PrimaryState &&

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/62040043/

=== modified file 'replicaset/replicaset_test.go'
--- replicaset/replicaset_test.go	2014-01-13 21:18:11 +0000
+++ replicaset/replicaset_test.go	2014-02-12 05:36:19 +0000
@@ -348,10 +348,14 @@
 	for attempt.Next() {
 		var err error
 		res, err = CurrentStatus(session)
-
-		if err != nil && !attempt.HasNext() {
-			c.Errorf("Couldn't get status before timeout, got err: %v", err)
-			return
+		if err != nil {
+			if !attempt.HasNext() {
+				c.Errorf("Couldn't get status before timeout, got err: %v", err)
+				return
+			} else {
+				// try again
+				continue
+			}
 		}
 
 		if res.Members[0].State == PrimaryState &&