bug: set auto accept not working correctly

mdns/mdns.go

@@ -381,10 +381,25 @@ func (m *MdnsManager) SetAutoAccept(accept bool) {
 		return
 	}
 
+	if m.mdnsProvider == nil {
+		return
+	}
+
+	m.mdnsProvider.Unannounce()
+
 	// Update the announcement as autoaccept changed
-	if err := m.AnnounceMdnsEntry(); err != nil {
-		logging.Log().Debug("mdns: changing mdns entry failed", err)
+	err := m.AnnounceMdnsEntry()
+
+	if err == nil {
+		return
 	}
+
+	logging.Log().Debug("mdns: changing mdns entry failed", err)
+
+	m.mux.Lock()
+	defer m.mux.Unlock()
+
+	m.setIsServiceAnnounce(false)
 }
 
 // SetTestProvider injects a mock provider for testing purposes

mdns/mdns_test.go

@@ -2,6 +2,7 @@ package mdns
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"testing"
 	"time"
@@ -823,3 +824,78 @@ func (s *MdnsSuite) Test_Shutdown_DefensiveProgramming() {
 	// Verify provider is cleaned up (defensive shutdown succeeded)
 	assert.Nil(s.T(), manager.mdnsProvider)
 }
+
+func (s *MdnsSuite) Test_AutoAccepServiceUnannouncedYet() {
+	s.sut.mdnsProvider = s.sut.testProvider
+
+	// nothing has been announced yet
+	s.sut.isAnnounced = false
+
+	s.sut.SetAutoAccept(true)
+	assert.True(s.T(), s.sut.autoaccept)
+
+	s.sut.SetAutoAccept(false)
+	assert.False(s.T(), s.sut.autoaccept)
+
+	assert.False(s.T(), s.sut.isAnnounced)
+
+	// no unnancounce and no announce expected
+	s.mdnsProvider.AssertNotCalled(s.T(), "Unannounce")
+	s.mdnsProvider.AssertNotCalled(s.T(), "Announce", mock.Anything, mock.Anything, mock.Anything)
+}
+
+func (s *MdnsSuite) Test_AutoAcceptMdnsProviderNil() {
+	s.sut.mdnsProvider = nil
+
+	// something has already been announced
+	s.sut.isAnnounced = true
+
+	s.sut.SetAutoAccept(true)
+	assert.True(s.T(), s.sut.autoaccept)
+
+	s.sut.SetAutoAccept(false)
+	assert.False(s.T(), s.sut.autoaccept)
+
+	assert.True(s.T(), s.sut.isAnnounced)
+
+	// no unnancounce and no announce expected
+	s.mdnsProvider.AssertNotCalled(s.T(), "Unannounce")
+	s.mdnsProvider.AssertNotCalled(s.T(), "Announce", mock.Anything, mock.Anything, mock.Anything)
+}
+
+func (s *MdnsSuite) Test_AutoAcceptServiceAlreadyAnnounced() {
+	mdnsProvider := mocks.NewMdnsProviderInterface(s.T())
+	s.sut.mdnsProvider = mdnsProvider
+
+	// something has already been announced
+	s.sut.isAnnounced = true
+
+	mdnsProvider.EXPECT().Unannounce()
+	mdnsProvider.EXPECT().Announce(mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	s.sut.SetAutoAccept(true)
+	assert.True(s.T(), s.sut.autoaccept)
+
+	mdnsProvider.EXPECT().Unannounce()
+	mdnsProvider.EXPECT().Announce(mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	s.sut.SetAutoAccept(false)
+	assert.False(s.T(), s.sut.autoaccept)
+
+	assert.True(s.T(), s.sut.isAnnounced)
+	mdnsProvider.EXPECT().Shutdown()
+}
+
+func (s *MdnsSuite) Test_AutoAcceptMdnsProviderReannounceFails() {
+	mdnsProvider := mocks.NewMdnsProviderInterface(s.T())
+	s.sut.mdnsProvider = mdnsProvider
+
+	// something has already been announced
+	s.sut.isAnnounced = true
+
+	mdnsProvider.EXPECT().Unannounce()
+	mdnsProvider.EXPECT().Announce(mock.Anything, mock.Anything, mock.Anything).Return(fmt.Errorf("myError"))
+	s.sut.SetAutoAccept(true)
+	assert.True(s.T(), s.sut.autoaccept)
+	assert.False(s.T(), s.sut.isAnnounced)
+
+	mdnsProvider.EXPECT().Shutdown()
+}