Merge pull request canonical#9431 from zyga/tweak/desktop-notificatio…

…n-tests

desktop/notification: add unit tests

desktop/notification/export_test.go

@@ -0,0 +1,24 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2020 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package notification
+
+var (
+	ProcessSignal = processSignal
+)

desktop/notification/fdo.go

@@ -22,9 +22,10 @@ package notification
 import (
 	"context"
 	"fmt"
-	"log"
 
 	"github.com/godbus/dbus"
+
+	"github.com/snapcore/snapd/logger"
 )
 
 const (
@@ -136,7 +137,7 @@ func (srv *Server) ObserveNotifications(ctx context.Context, observer Observer)
 			// to clobber the actual error being returned from the function in
 			// general, so ignore RemoveMatchSignal errors and just log them
 			// instead.
-			log.Print("Cannot remove D-Bus signal matcher:", err)
+			logger.Noticef("Cannot remove D-Bus signal matcher: %v", err)
 		}
 	}()