overlord/ifacestate,daemon: simplify mocking of security backends

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

daemon/api_test.go

@@ -111,7 +111,7 @@ func (s *apiSuite) SetUpTest(c *check.C) {
 	}
 	s.d = nil
 	// Disable real security backends for all API tests
-	s.restoreBackends = ifacestate.MockSecurityBackendsForSnap(nil)
+	s.restoreBackends = ifacestate.MockSecurityBackends(nil)
 }
 
 func (s *apiSuite) TearDownTest(c *check.C) {

overlord/ifacestate/ifacemgr.go

@@ -458,14 +458,12 @@ func (m *InterfaceManager) Repository() *interfaces.Repository {
 	return m.repo
 }
 
-// MockSecurityBackendsForSnap mocks the list of security backends that are used for setting up security.
+// MockSecurityBackends mocks the list of security backends that are used for setting up security.
 //
 // This function is public because it is referenced in the daemon
-func MockSecurityBackendsForSnap(fn func(snapInfo *snap.Info) []interfaces.SecurityBackend) func() {
-	if fn != nil {
-		securityBackendsForSnap = fn
-	} else {
-		securityBackendsForSnap = func(snapInfo *snap.Info) []interfaces.SecurityBackend { return nil }
+func MockSecurityBackends(backends []interfaces.SecurityBackend) func() {
+	securityBackendsForSnap = func(snapInfo *snap.Info) []interfaces.SecurityBackend {
+		return backends
 	}
 	return func() { securityBackendsForSnap = securityBackendsForSnapImpl }
 }

overlord/ifacestate/ifacemgr_test.go

@@ -55,11 +55,7 @@ func (s *interfaceManagerSuite) SetUpTest(c *C) {
 	s.privateMgr = nil
 	s.extraIfaces = nil
 	s.secBackend = &interfaces.TestSecurityBackend{}
-	s.restoreBackends = ifacestate.MockSecurityBackendsForSnap(
-		func(snapInfo *snap.Info) []interfaces.SecurityBackend {
-			return []interfaces.SecurityBackend{s.secBackend}
-		},
-	)
+	s.restoreBackends = ifacestate.MockSecurityBackends([]interfaces.SecurityBackend{s.secBackend})
 }
 
 func (s *interfaceManagerSuite) TearDownTest(c *C) {