From 97711a54974fdae68e23249100a569d01519e19e Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Fri, 19 Aug 2016 10:49:15 -0700 Subject: [PATCH] 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 --- testutil/agent.go | 6 ++++++ testutil/controller.go | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testutil/agent.go b/testutil/agent.go index 8329a106c..b2c2efd4f 100644 --- 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 index 9ab909e51..3a544c12f 100644 --- 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