[ARVADOS] updated: b8d98eba35c5a9d902eddbf42fd53a37bb6b30c4

Git user git at public.curoverse.com
Mon Oct 17 08:58:15 EDT 2016


Summary of changes:
 sdk/go/streamer/streamer.go      | 24 +++++++++++++++++++++---
 sdk/go/streamer/streamer_test.go | 10 ++++++++++
 services/keepstore/keepstore.go  |  2 +-
 3 files changed, 32 insertions(+), 4 deletions(-)

       via  b8d98eba35c5a9d902eddbf42fd53a37bb6b30c4 (commit)
       via  5fd9b5a5fb88f40b999ab6c9fa9435ad01f595ff (commit)
       via  a7d5b045f79eecc54949929abfdf13689626fcc3 (commit)
       via  a278be11225d5f4d77eaa332854421995ce20224 (commit)
      from  160644c09224113debdbae7c0be0c6e661dfebd8 (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 b8d98eba35c5a9d902eddbf42fd53a37bb6b30c4
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Oct 17 08:58:01 2016 -0400

    9956: Fix startup log message. refs #9956

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 69ff565..869a9cc 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -197,7 +197,7 @@ func main() {
 	if _, err := daemon.SdNotify("READY=1"); err != nil {
 		log.Printf("Error notifying init daemon: %v", err)
 	}
-	log.Println("listening at", listener.Addr)
+	log.Println("listening at", listener.Addr())
 	srv := &http.Server{}
 	srv.Serve(listener)
 }

commit 5fd9b5a5fb88f40b999ab6c9fa9435ad01f595ff
Merge: 160644c a7d5b04
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Oct 17 08:50:57 2016 -0400

    Merge branch '10211-double-close-crash' closes #10211


commit a7d5b045f79eecc54949929abfdf13689626fcc3
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Oct 17 05:11:25 2016 -0400

    10211: Clarify expected result of double-close.

diff --git a/sdk/go/streamer/streamer_test.go b/sdk/go/streamer/streamer_test.go
index e3274f7..f5333c3 100644
--- a/sdk/go/streamer/streamer_test.go
+++ b/sdk/go/streamer/streamer_test.go
@@ -366,12 +366,12 @@ func (s *StandaloneSuite) TestManyReaders(c *C) {
 	writer.Close()
 }
 
-func (s *StandaloneSuite) TestMultipleClose(c *C) {
+func (s *StandaloneSuite) TestMultipleCloseNoPanic(c *C) {
 	buffer := make([]byte, 100)
 	tr := AsyncStreamFromSlice(buffer)
 	sr := tr.MakeStreamReader()
-	sr.Close()
-	sr.Close()
-	tr.Close()
-	tr.Close()
+	c.Check(sr.Close(), IsNil)
+	c.Check(sr.Close(), Equals, ErrAlreadyClosed)
+	c.Check(tr.Close(), IsNil)
+	c.Check(tr.Close(), Equals, ErrAlreadyClosed)
 }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list