Merge lp:~chipaca/ubuntu-push/helper-outputs-tag into lp:ubuntu-push/automatic

[John Lenton]

Helper output now includes a tag, which is passed to the presenters.

Helper output now includes a tag, which is passed to the presenters.

[lp:~chipaca/ubuntu-push/helper-outputs-tag]

275. By John Lenton on 2014-07-22

reinstated a test

Unmerged revisions

275. By John Lenton on 2014-07-22

reinstated a test

274. By John Lenton on 2014-07-22

pass the tag into the presenters

273. By John Lenton on 2014-07-22

Merged present-cleanup into helper-outputs-tag.

272. By John Lenton on 2014-07-22

Merged cleanup-mmu-notif-map into helper-outputs-tag.

271. By John Lenton on 2014-07-22

Merged cleanup-mmu-notif-map into helper-outputs-tag.

270. By John Lenton on 2014-07-22

tags in helper output

=== modified file 'bus/emblemcounter/emblemcounter.go'
--- bus/emblemcounter/emblemcounter.go	2014-07-22 13:26:44 +0000
+++ bus/emblemcounter/emblemcounter.go	2014-07-22 13:26:44 +0000
@@ -49,7 +49,7 @@
 
 // Look for an EmblemCounter section in a Notification and, if
 // present, presents it to the user.
-func (ctr *EmblemCounter) Present(app *click.AppId, nid string, notification *launch_helper.Notification) bool {
+func (ctr *EmblemCounter) Present(app *click.AppId, nid string, tag string, notification *launch_helper.Notification) bool {
 	if notification == nil {
 		panic("please check notification is not nil before calling present")
 	}
 
=== modified file 'bus/emblemcounter/emblemcounter_test.go'
--- bus/emblemcounter/emblemcounter_test.go	2014-07-22 13:26:44 +0000
+++ bus/emblemcounter/emblemcounter_test.go	2014-07-22 13:26:44 +0000
@@ -52,7 +52,7 @@
 
 	ec := New(endp, ecs.log)
 	notif := launch_helper.Notification{EmblemCounter: &launch_helper.EmblemCounter{Count: 42, Visible: true}}
-	c.Check(ec.Present(ecs.app, "nid", &notif), Equals, true)
+	c.Check(ec.Present(ecs.app, "nid", "tag", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 2)
 	c.Check(callArgs[0].Member, Equals, "::SetProperty")
@@ -68,11 +68,11 @@
 	ec := New(endp, ecs.log)
 
 	// nothing happens if no EmblemCounter in Notification
-	c.Check(ec.Present(ecs.app, "nid", &launch_helper.Notification{}), Equals, false)
+	c.Check(ec.Present(ecs.app, "nid", "tag", &launch_helper.Notification{}), Equals, false)
 	c.Assert(testibus.GetCallArgs(endp), HasLen, 0)
 
 	// but an empty EmblemCounter is acted on
-	c.Check(ec.Present(ecs.app, "nid", &launch_helper.Notification{EmblemCounter: &launch_helper.EmblemCounter{}}), Equals, true)
+	c.Check(ec.Present(ecs.app, "nid", "tag", &launch_helper.Notification{EmblemCounter: &launch_helper.EmblemCounter{}}), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 2)
 	c.Check(callArgs[0].Member, Equals, "::SetProperty")
@@ -87,5 +87,5 @@
 	ec := New(endp, ecs.log)
 
 	// nothing happens if no EmblemCounter in Notification
-	c.Check(func() { ec.Present(ecs.app, "nid", nil) }, Panics, `please check notification is not nil before calling present`)
+	c.Check(func() { ec.Present(ecs.app, "nid", "tag", nil) }, Panics, `please check notification is not nil before calling present`)
 }
 
=== modified file 'bus/haptic/haptic.go'
--- bus/haptic/haptic.go	2014-07-22 13:26:44 +0000
+++ bus/haptic/haptic.go	2014-07-22 13:26:44 +0000
@@ -44,7 +44,7 @@
 }
 
 // Present presents the notification via a vibrate pattern
-func (haptic *Haptic) Present(_ *click.AppId, nid string, notification *launch_helper.Notification) bool {
+func (haptic *Haptic) Present(_ *click.AppId, nid string, tag string, notification *launch_helper.Notification) bool {
 	if notification == nil {
 		panic("please check notification is not nil before calling present")
 	}
 
=== modified file 'bus/haptic/haptic_test.go'
--- bus/haptic/haptic_test.go	2014-07-22 13:26:44 +0000
+++ bus/haptic/haptic_test.go	2014-07-22 13:26:44 +0000
@@ -49,7 +49,7 @@
 
 	ec := New(endp, hs.log)
 	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Pattern: []uint32{200, 100}, Repeat: 2}}
-	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
+	c.Check(ec.Present(hs.app, "nid", "tag", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
 	c.Check(callArgs[0].Member, Equals, "VibratePattern")
@@ -63,7 +63,7 @@
 	ec := New(endp, hs.log)
 	// note: no Repeat:
 	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Pattern: []uint32{200, 100}}}
-	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
+	c.Check(ec.Present(hs.app, "nid", "tag", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
 	c.Check(callArgs[0].Member, Equals, "VibratePattern")
@@ -78,7 +78,7 @@
 	ec := New(endp, hs.log)
 	// note: no Repeat, no Pattern, just Duration:
 	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Duration: 200}}
-	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
+	c.Check(ec.Present(hs.app, "nid", "tag", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
 	c.Check(callArgs[0].Member, Equals, "VibratePattern")
@@ -93,7 +93,7 @@
 	ec := New(endp, hs.log)
 	// note: Duration given, as well as Pattern; Repeat given as 0:
 	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Duration: 200, Pattern: []uint32{500}, Repeat: 0}}
-	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
+	c.Check(ec.Present(hs.app, "nid", "tag", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
 	c.Check(callArgs[0].Member, Equals, "VibratePattern")
@@ -107,9 +107,9 @@
 
 	ec := New(endp, hs.log)
 	// no Vibration in the notificaton
-	c.Check(ec.Present(hs.app, "", &launch_helper.Notification{}), Equals, false)
+	c.Check(ec.Present(hs.app, "", "tag", &launch_helper.Notification{}), Equals, false)
 	// empty Vibration
-	c.Check(ec.Present(hs.app, "", &launch_helper.Notification{Vibrate: &launch_helper.Vibration{}}), Equals, false)
+	c.Check(ec.Present(hs.app, "", "tag", &launch_helper.Notification{Vibrate: &launch_helper.Vibration{}}), Equals, false)
 }
 
 // check that Present() panics if the notification is nil
@@ -118,5 +118,5 @@
 
 	ec := New(endp, hs.log)
 	// no notification at all
-	c.Check(func() { ec.Present(hs.app, "", nil) }, Panics, `please check notification is not nil before calling present`)
+	c.Check(func() { ec.Present(hs.app, "", "tag", nil) }, Panics, `please check notification is not nil before calling present`)
 }
 
=== modified file 'bus/notifications/raw.go'
--- bus/notifications/raw.go	2014-07-22 13:26:44 +0000
+++ bus/notifications/raw.go	2014-07-22 13:26:44 +0000
@@ -131,7 +131,7 @@
 // If card.Actions has 1 action, it's an interactive notification.
 // If card.Actions has 2 actions, it will show as a snap decision.
 // If it has more actions, who knows (good luck).
-func (raw *RawNotifications) Present(app *click.AppId, nid string, notification *launch_helper.Notification) bool {
+func (raw *RawNotifications) Present(app *click.AppId, nid string, tag string, notification *launch_helper.Notification) bool {
 	if notification == nil {
 		panic("please check notification is not nil before calling present")
 	}
 
=== modified file 'bus/notifications/raw_test.go'
--- bus/notifications/raw_test.go	2014-07-22 13:26:44 +0000
+++ bus/notifications/raw_test.go	2014-07-22 13:26:44 +0000
@@ -160,14 +160,16 @@
 func (s *RawSuite) TestPresentNotifies(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true}})
+	notif := &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true}}
+	worked := raw.Present(s.app, "notifId", "tag", notif)
 	c.Check(worked, Equals, true)
 }
 
 func (s *RawSuite) TestPresentOneAction(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes"}}})
+	notif := &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes"}}}
+	worked := raw.Present(s.app, "notifId", "tag", notif)
 	c.Check(worked, Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
@@ -191,7 +193,8 @@
 func (s *RawSuite) TestPresentTwoActions(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes", "No"}}})
+	notif := &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes", "No"}}}
+	worked := raw.Present(s.app, "notifId", "tag", notif)
 	c.Check(worked, Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
@@ -218,7 +221,8 @@
 func (s *RawSuite) TestPresentThreeActions(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes", "No", "What"}}})
+	notif := &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary", Popup: true, Actions: []string{"Yes", "No", "What"}}}
+	worked := raw.Present(s.app, "notifId", "tag", notif)
 	c.Check(worked, Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
@@ -238,26 +242,26 @@
 func (s *RawSuite) TestPresentNoNotificationPanics(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	c.Check(func() { raw.Present(s.app, "notifId", nil) }, Panics, `please check notification is not nil before calling present`)
+	c.Check(func() { raw.Present(s.app, "notifId", "tag", nil) }, Panics, `please check notification is not nil before calling present`)
 }
 
 func (s *RawSuite) TestPresentNoCardDoesNotNotify(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{})
+	worked := raw.Present(s.app, "notifId", "tag", &launch_helper.Notification{})
 	c.Check(worked, Equals, false)
 }
 
 func (s *RawSuite) TestPresentNoSummaryDoesNotNotify(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{}})
+	worked := raw.Present(s.app, "notifId", "tag", &launch_helper.Notification{Card: &launch_helper.Card{}})
 	c.Check(worked, Equals, false)
 }
 
 func (s *RawSuite) TestPresentNoPopupNoNotify(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	raw := Raw(endp, s.log)
-	worked := raw.Present(s.app, "notifId", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary"}})
+	worked := raw.Present(s.app, "notifId", "tag", &launch_helper.Notification{Card: &launch_helper.Card{Summary: "summary"}})
 	c.Check(worked, Equals, false)
 }
 
=== modified file 'client/service/postal.go'
--- client/service/postal.go	2014-07-22 13:26:44 +0000
+++ client/service/postal.go	2014-07-22 13:26:44 +0000
@@ -43,7 +43,7 @@
 
 // a Presenter is something that knows how to present a Notification
 type Presenter interface {
-	Present(*click.AppId, string, *launch_helper.Notification) bool
+	Present(*click.AppId, string, string, *launch_helper.Notification) bool
 }
 
 // PostalService is the dbus api
@@ -332,7 +332,7 @@
 		b := false
 		for _, p := range svc.Presenters {
 			// we don't want this to shortcut :)
-			b = p.Present(app, nid, output.Notification) || b
+			b = p.Present(app, nid, output.Tag, output.Notification) || b
 		}
 		return b
 	} else {
 
=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2014-07-22 13:26:44 +0000
+++ client/service/postal_test.go	2014-07-22 13:26:44 +0000
@@ -492,7 +492,7 @@
 	c.Check(svc.GetMessageHandler(), IsNil)
 	svc.SetMessageHandler(f)
 	c.Check(svc.GetMessageHandler(), NotNil)
-	hOutput := &launch_helper.HelperOutput{[]byte("37"), nil}
+	hOutput := &launch_helper.HelperOutput{[]byte("37"), nil, ""}
 	c.Check(svc.msgHandler(nil, "", hOutput), Equals, false)
 	c.Check(ext, DeepEquals, hOutput)
 }
@@ -560,7 +560,7 @@
 func (ps *postalSuite) TestMessageHandlerReportsButIgnoresUnmarshalErrors(c *C) {
 	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
 	c.Assert(svc.Start(), IsNil)
-	output := &launch_helper.HelperOutput{[]byte(`broken`), nil}
+	output := &launch_helper.HelperOutput{[]byte(`broken`), nil, ""}
 	b := svc.messageHandler(nil, "", output)
 	c.Check(b, Equals, false)
 	c.Check(ps.log.Captured(), Matches, "(?msi).*skipping notification: nil.*")
@@ -571,7 +571,7 @@
 	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	svc.NotificationsEndp = endp
-	output := &launch_helper.HelperOutput{[]byte(`{}`), nil}
+	output := &launch_helper.HelperOutput{[]byte(`{}`), nil, ""}
 	b := svc.messageHandler(nil, "", output)
 	c.Assert(b, Equals, false)
 	c.Check(ps.log.Captured(), Matches, "(?msi).*skipping notification: nil.*")
 
=== modified file 'launch_helper/helper_output.go'
--- launch_helper/helper_output.go	2014-07-18 14:23:34 +0000
+++ launch_helper/helper_output.go	2014-07-22 13:26:44 +0000
@@ -60,6 +60,7 @@
 type HelperOutput struct {
 	Message      json.RawMessage `json:"message,omitempty"`      // what to put in the post office's queue
 	Notification *Notification   `json:"notification,omitempty"` // what to present to the user
+	Tag          string          `json:"tag,omitempty"`          // tag used for Clear/ListPersistent.
 }
 
 // HelperResult is the result of a helper run for a particular app id
 
=== modified file 'launch_helper/kindpool_test.go'
--- launch_helper/kindpool_test.go	2014-07-19 00:18:18 +0000
+++ launch_helper/kindpool_test.go	2014-07-22 13:26:44 +0000
@@ -268,12 +268,51 @@
 	c.Check(res.Message, DeepEquals, input.Payload)
 }
 
+func (s *poolSuite) TestOneDoneOnValid(c *C) {
+	pool := s.pool.(*kindHelperPool)
+	ch := pool.Start()
+	defer pool.Stop()
+
+	d := c.MkDir()
+
+	app := clickhelp.MustParseAppId("com.example.test_test-app")
+	input := &HelperInput{
+		App: app,
+	}
+	args := HelperArgs{
+		Input:   input,
+		FileOut: filepath.Join(d, "file_out.json"),
+		Timer:   &time.Timer{},
+	}
+	pool.hmap["l:1"] = &args
+
+	f, err := os.Create(args.FileOut)
+	c.Assert(err, IsNil)
+	defer f.Close()
+	_, err = f.Write([]byte(`{"tag": "24", "notification": {"sound": "hello"}}`))
+	c.Assert(err, IsNil)
+
+	go pool.OneDone("l:1")
+
+	var res *HelperResult
+	select {
+	case res = <-ch:
+	case <-time.After(100 * time.Millisecond):
+		c.Fatal("timeout")
+	}
+
+	expected := HelperOutput{Tag: "24", Notification: &Notification{Sound: "hello"}}
+	c.Check(res.HelperOutput, DeepEquals, expected)
+	c.Check(pool.hmap, HasLen, 0)
+}
+
 func (s *poolSuite) TestOneDoneNop(c *C) {
 	pool := s.pool.(*kindHelperPool)
 	pool.OneDone("")
+	// huzzah, that didn't blow up.
 }
 
-func (s *poolSuite) TestOneDoneOnValid(c *C) {
+func (s *poolSuite) TestOneDoneValidWNoTag(c *C) {
 	pool := s.pool.(*kindHelperPool)
 	ch := pool.Start()
 	defer pool.Stop()
 
=== modified file 'messaging/messaging.go'
--- messaging/messaging.go	2014-07-22 13:26:44 +0000
+++ messaging/messaging.go	2014-07-22 13:26:44 +0000
@@ -97,7 +97,7 @@
 	mmu.stopCleanupLoopCh <- true
 }
 
-func (mmu *MessagingMenu) Present(app *click.AppId, nid string, notification *launch_helper.Notification) bool {
+func (mmu *MessagingMenu) Present(app *click.AppId, nid string, tag string, notification *launch_helper.Notification) bool {
 	if notification == nil {
 		panic("please check notification is not nil before calling present")
 	}
 
=== modified file 'messaging/messaging_test.go'
--- messaging/messaging_test.go	2014-07-22 13:26:44 +0000
+++ messaging/messaging_test.go	2014-07-22 13:26:44 +0000
@@ -55,7 +55,7 @@
 	card := launch_helper.Card{Summary: "ehlo", Persist: true}
 	notif := launch_helper.Notification{Card: &card}
 
-	c.Check(mmu.Present(ms.app, "notif-id", &notif), Equals, true)
+	c.Check(mmu.Present(ms.app, "notif-id", "tag", &notif), Equals, true)
 
 	c.Check(ms.log.Captured(), Matches, `(?s).* ADD:.*notif-id.*`)
 }
@@ -65,7 +65,7 @@
 	card := launch_helper.Card{Persist: true}
 	notif := launch_helper.Notification{Card: &card}
 
-	c.Check(mmu.Present(ms.app, "notif-id", &notif), Equals, false)
+	c.Check(mmu.Present(ms.app, "notif-id", "tag", &notif), Equals, false)
 
 	c.Check(ms.log.Captured(), Matches, "(?sm).*has no persistable card.*")
 }
@@ -75,19 +75,19 @@
 	card := launch_helper.Card{Summary: "ehlo"}
 	notif := launch_helper.Notification{Card: &card}
 
-	c.Check(mmu.Present(ms.app, "notif-id", &notif), Equals, false)
+	c.Check(mmu.Present(ms.app, "notif-id", "tag", &notif), Equals, false)
 
 	c.Check(ms.log.Captured(), Matches, "(?sm).*has no persistable card.*")
 }
 
 func (ms *MessagingSuite) TestPresentPanicsIfNil(c *C) {
 	mmu := New(ms.log)
-	c.Check(func() { mmu.Present(ms.app, "notif-id", nil) }, Panics, `please check notification is not nil before calling present`)
+	c.Check(func() { mmu.Present(ms.app, "notif-id", "tag", nil) }, Panics, `please check notification is not nil before calling present`)
 }
 
 func (ms *MessagingSuite) TestPresentDoesNotPresentsIfNilCard(c *C) {
 	mmu := New(ms.log)
-	c.Check(mmu.Present(ms.app, "notif-id", &launch_helper.Notification{}), Equals, false)
+	c.Check(mmu.Present(ms.app, "notif-id", "tag", &launch_helper.Notification{}), Equals, false)
 	c.Check(ms.log.Captured(), Matches, "(?sm).*no persistable card.*")
 }
 
@@ -96,7 +96,7 @@
 	card := launch_helper.Card{Summary: "ehlo", Persist: true, Actions: []string{"action-1"}}
 	notif := launch_helper.Notification{Card: &card}
 
-	c.Check(mmu.Present(ms.app, "notif-id", &notif), Equals, true)
+	c.Check(mmu.Present(ms.app, "notif-id", "tag", &notif), Equals, true)
 
 	c.Check(ms.log.Captured(), Matches, `(?s).* ADD:.*notif-id.*`)
 
 
=== modified file 'sounds/sounds.go'
--- sounds/sounds.go	2014-07-22 13:26:44 +0000
+++ sounds/sounds.go	2014-07-22 13:26:44 +0000
@@ -39,7 +39,7 @@
 	return &Sound{player: "paplay", log: log, dataDirs: xdg.Data.Dirs, dataFind: xdg.Data.Find}
 }
 
-func (snd *Sound) Present(app *click.AppId, nid string, notification *launch_helper.Notification) bool {
+func (snd *Sound) Present(app *click.AppId, nid string, tag string, notification *launch_helper.Notification) bool {
 	if notification == nil {
 		panic("please check notification is not nil before calling present")
 	}
 
=== modified file 'sounds/sounds_test.go'
--- sounds/sounds_test.go	2014-07-22 13:26:44 +0000
+++ sounds/sounds_test.go	2014-07-22 13:26:44 +0000
@@ -56,7 +56,7 @@
 		dataFind: func(s string) (string, error) { return s, nil },
 	}
 
-	c.Check(s.Present(ss.app, "",
+	c.Check(s.Present(ss.app, "", "tag",
 		&launch_helper.Notification{Sound: "hello"}), Equals, true)
 	c.Check(ss.log.Captured(), Matches, `(?sm).* playing sound com.example.test/hello using echo`)
 }
@@ -70,14 +70,14 @@
 	}
 
 	// nil notification
-	c.Check(func() { s.Present(ss.app, "", nil) }, Panics, `please check notification is not nil before calling present`)
+	c.Check(func() { s.Present(ss.app, "", "tag", nil) }, Panics, `please check notification is not nil before calling present`)
 	// no Sound
-	c.Check(s.Present(ss.app, "", &launch_helper.Notification{}), Equals, false)
+	c.Check(s.Present(ss.app, "", "tag", &launch_helper.Notification{}), Equals, false)
 	// bad player
-	c.Check(s.Present(ss.app, "", &launch_helper.Notification{Sound: "hello"}), Equals, false)
+	c.Check(s.Present(ss.app, "", "tag", &launch_helper.Notification{Sound: "hello"}), Equals, false)
 	s.player = "echo"
 	// no file found
-	c.Check(s.Present(ss.app, "", &launch_helper.Notification{Sound: "hello"}), Equals, false)
+	c.Check(s.Present(ss.app, "", "tag", &launch_helper.Notification{Sound: "hello"}), Equals, false)
 
 	// and now, just to prove it would've worked,
 
@@ -86,5 +86,5 @@
 	c.Assert(err, IsNil)
 	f.Close()
 	s.dataDirs = func() []string { return []string{"", d} }
-	c.Check(s.Present(ss.app, "", &launch_helper.Notification{Sound: "hello"}), Equals, true)
+	c.Check(s.Present(ss.app, "", "tag", &launch_helper.Notification{Sound: "hello"}), Equals, true)
 }