Merge lp:~nikwen/ubuntu-push/old-cleanup-fix-revert into lp:ubuntu-push/automatic

[Niklas Wenzel]

Revert the old fix for LP: #1451510 as we have a new fix for it

Revert the old fix for LP: #1451510 as we have a new fix for it

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'messaging/messaging.go'
--- messaging/messaging.go	2015-05-20 07:31:17 +0000
+++ messaging/messaging.go	2015-07-15 20:29:01 +0000
@@ -81,10 +81,6 @@
 func (mmu *MessagingMenu) cleanUpNotifications() {
 	mmu.lock.Lock()
 	defer mmu.lock.Unlock()
-	mmu.doCleanUpNotifications()
-}
-
-func (mmu *MessagingMenu) doCleanUpNotifications() {
 	for nid, payload := range mmu.notifications {
 		if payload.Gone {
 			// sweep
@@ -126,11 +122,10 @@
 func (mmu *MessagingMenu) Tags(app *click.AppId) []string {
 	orig := app.Original()
 	tags := []string(nil)
-	mmu.lock.Lock()
-	defer mmu.lock.Unlock()
-	mmu.doCleanUpNotifications()
+	mmu.lock.RLock()
+	defer mmu.lock.RUnlock()
 	for _, payload := range mmu.notifications {
-		if payload.App.Original() == orig && !payload.Gone {
+		if payload.App.Original() == orig {
 			tags = append(tags, payload.Tag)
 		}
 	}

=== modified file 'messaging/messaging_test.go'
--- messaging/messaging_test.go	2015-05-20 07:47:50 +0000
+++ messaging/messaging_test.go	2015-07-15 20:29:01 +0000
@@ -48,6 +48,8 @@
 	cRemoveNotification = func(a, n string) {
 		ms.log.Debugf("REMOVE: app: %s, not: %s", a, n)
 	}
+	// just in case
+	cNotificationExists = nil
 }
 
 func (ms *MessagingSuite) TearDownSuite(c *C) {
@@ -59,8 +61,6 @@
 func (ms *MessagingSuite) SetUpTest(c *C) {
 	ms.log = helpers.NewTestLogger(c, "debug")
 	ms.app = clickhelp.MustParseAppId("com.example.test_test_0")
-	// just in case
-	cNotificationExists = nil
 }
 
 func (ms *MessagingSuite) TestPresentPresents(c *C) {
@@ -129,13 +129,6 @@
 }
 
 func (ms *MessagingSuite) TestTagsListsTags(c *C) {
-	existsCount := 0
-	// patch cnotificationexists to return true
-	cNotificationExists = func(did string, nid string) bool {
-		existsCount++
-		return true
-	}
-
 	mmu := New(ms.log)
 	f := func(s string) *launch_helper.Notification {
 		card := launch_helper.Card{Summary: "tag: \"" + s + "\"", Persist: true}
@@ -145,14 +138,8 @@
 	c.Check(mmu.Tags(ms.app), IsNil)
 	c.Assert(mmu.Present(ms.app, "notif1", f("one")), Equals, true)
 	ms.checkTags(c, mmu.Tags(ms.app), []string{"one"})
-	c.Check(existsCount, Equals, 1)
-	existsCount = 0
-
 	c.Assert(mmu.Present(ms.app, "notif2", f("")), Equals, true)
 	ms.checkTags(c, mmu.Tags(ms.app), []string{"one", ""})
-	c.Check(existsCount, Equals, 2)
-	existsCount = 0
-
 	// and an empty notification doesn't count
 	c.Assert(mmu.Present(ms.app, "notif3", &launch_helper.Notification{Tag: "X"}), Equals, false)
 	ms.checkTags(c, mmu.Tags(ms.app), []string{"one", ""})
@@ -163,32 +150,7 @@
 	c.Check(mmu.Tags(ms.app), IsNil)
 }
 
-func (ms *MessagingSuite) TestTagsSkipGone(c *C) {
-	existsCount := 0
-	// patch cnotificationexists to return false
-	cNotificationExists = func(did string, nid string) bool {
-		existsCount++
-		return false
-	}
-
-	mmu := New(ms.log)
-	f := func(s string) *launch_helper.Notification {
-		card := launch_helper.Card{Summary: "tag: \"" + s + "\"", Persist: true}
-		return &launch_helper.Notification{Card: &card, Tag: s}
-	}
-
-	c.Check(mmu.Tags(ms.app), IsNil)
-	c.Assert(mmu.Present(ms.app, "notif1", f("one")), Equals, true)
-	ms.checkTags(c, mmu.Tags(ms.app), []string(nil))
-	c.Check(existsCount, Equals, 1)
-}
-
 func (ms *MessagingSuite) TestClearClears(c *C) {
-	// patch cnotificationexists to return true
-	cNotificationExists = func(did string, nid string) bool {
-		return true
-	}
-
 	app1 := ms.app
 	app2 := clickhelp.MustParseAppId("com.example.test_test-2_0")
 	app3 := clickhelp.MustParseAppId("com.example.test_test-3_0")