Merge pull request #472 from tpepper/master

testutil: close result channels before ending ssntp session
ciao-project · Aug 17, 2016 · 098caff · 098caff
2 parents e8916ad + 456d68d
commit 098caff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/testutil/agent.go b/testutil/agent.go
@@ -59,8 +59,8 @@ type SsntpTestClient struct {
 
 // Shutdown shuts down the testutil.SsntpTestClient and cleans up state
 func (client *SsntpTestClient) Shutdown() {
-	client.Ssntp.Close()
 	closeClientChans(client)
+	client.Ssntp.Close()
 }
 
 // NewSsntpTestClientConnection creates an SsntpTestClient and dials the server.

diff --git a/testutil/controller.go b/testutil/controller.go
@@ -41,8 +41,8 @@ type SsntpTestController struct {
 
 // Shutdown shuts down the testutil.SsntpTestClient and cleans up state
 func (ctl *SsntpTestController) Shutdown() {
-	ctl.Ssntp.Close()
 	closeControllerChans(ctl)
+	ctl.Ssntp.Close()
 }
 
 // NewSsntpTestControllerConnection creates an SsntpTestController and dials the server.

diff --git a/testutil/server.go b/testutil/server.go
@@ -579,8 +579,8 @@ func (server *SsntpTestServer) CommandForward(uuid string, command ssntp.Command
 
 // Shutdown shuts down the testutil.SsntpTestServer and cleans up state
 func (server *SsntpTestServer) Shutdown() {
-	server.Ssntp.Stop()
 	closeServerChans(server)
+	server.Ssntp.Stop()
 }
 
 // StartTestServer starts a go routine for based on a