testutil: don't dup result chan write for NodeConnected/Disconnected

The NodeConnected/Disconnected() helpers are a little odd in how they're disjoint from all the other events which flow through EventNotify(). They event shouldn't be processed in both places. Insure that by returning from EventNotify() in the case those are the event being processed. Signed-off-by: Tim Pepper <[email protected]>
ciao-project · Aug 19, 2016 · 97711a5 · 97711a5
1 parent 4fb5889
commit 97711a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/testutil/agent.go b/testutil/agent.go
@@ -497,6 +497,12 @@ func (client *SsntpTestClient) EventNotify(event ssntp.Event, frame *ssntp.Frame
 	var result Result
 
 	switch event {
+	case ssntp.NodeConnected:
+		//handled by ConnectNotify()
+		return
+	case ssntp.NodeDisconnected:
+		//handled by DisconnectNotify()
+		return
 	case ssntp.TenantAdded:
 		var tenantAddedEvent payloads.EventTenantAdded
 

diff --git a/testutil/controller.go b/testutil/controller.go
@@ -287,10 +287,14 @@ func (ctl *SsntpTestController) EventNotify(event ssntp.Event, frame *ssntp.Fram
 	var result Result
 
 	switch event {
-	// case ssntp.NodeConnected:	handled by ConnectNotify()
-	// case ssntp.NodeDisconnected:	handled by DisconnectNotify()
 	// case ssntp.TenantAdded: does not reach controller
 	// case ssntp.TenantRemoved: does not reach controller
+	case ssntp.NodeConnected:
+		//handled by ConnectNotify()
+		return
+	case ssntp.NodeDisconnected:
+		//handled by DisconnectNotify()
+		return
 	case ssntp.PublicIPAssigned:
 		var publicIPAssignedEvent payloads.EventPublicIPAssigned