[ARVADOS] updated: 3147edd07223f5ecac0c12d4ec34cc4c4cb7d657

[git at public.curoverse.com]

Summary of changes:
 services/keepproxy/keepproxy.go      | 1 -
 services/keepproxy/keepproxy_test.go | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  3147edd07223f5ecac0c12d4ec34cc4c4cb7d657 (commit)
      from  1ab570c97f6124ec4249f03c58cbb586f147e11f (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 3147edd07223f5ecac0c12d4ec34cc4c4cb7d657
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Dec 7 18:09:00 2014 -0500

    Reset listener=nil before running main() from test cases, so
    waitForListener() does not get confused by listener!=nil left over
    from previous tests. Fixes intermittent test failures.
    
    refs #3828

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index a601938..888db73 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -105,7 +105,6 @@ func main() {
 		s := <-sig
 		log.Println("caught signal:", s)
 		listener.Close()
-		listener = nil
 	}(term)
 	signal.Notify(term, syscall.SIGTERM)
 	signal.Notify(term, syscall.SIGINT)
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 0ac843f..11dd206 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -138,6 +138,7 @@ func runProxy(c *C, args []string, token string, port int) keepclient.KeepClient
 	os.Args = append(args, fmt.Sprintf("-listen=:%v", port))
 	os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
 
+	listener = nil
 	go main()
 	time.Sleep(100 * time.Millisecond)
 
@@ -162,6 +163,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 
 	os.Args = []string{"keepproxy", "-listen=:29950"}
 	os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+	listener = nil
 	go main()
 	time.Sleep(100 * time.Millisecond)
 

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


hooks/post-receive
--