[ARVADOS] updated: a75ef0985d2a385165168cbb488cf97382308549

[git at public.curoverse.com]

Summary of changes:
 sdk/go/keepclient/keepclient_test.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

       via  a75ef0985d2a385165168cbb488cf97382308549 (commit)
      from  6de0a4ab0323e69a5499e59af03c9c5e6125fed7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a75ef0985d2a385165168cbb488cf97382308549
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sun Nov 16 08:25:27 2014 -0500

    Fix sdk/go/keepclient test race condition
    
    This closes #4395

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index c1088ef..5f9915d 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -391,8 +391,14 @@ func (s *StandaloneSuite) TestPutWithFail(c *C) {
 	c.Check(err, Equals, nil)
 	c.Check(phash, Equals, "")
 	c.Check(replicas, Equals, 2)
-	c.Check(<-st.handled, Equals, shuff[1])
-	c.Check(<-st.handled, Equals, shuff[2])
+
+	s1 := <-st.handled
+	s2 := <-st.handled
+
+	c.Check((s1 == shuff[1] && s2 == shuff[2]) ||
+		(s1 == shuff[2] && s2 == shuff[1]),
+		Equals,
+		true)
 }
 
 func (s *StandaloneSuite) TestPutWithTooManyFail(c *C) {

-----------------------------------------------------------------------


hooks/post-receive
--