Merge lp:~ralsina/ubuntu-push/merge-automatic into lp:ubuntu-push

[Roberto Alsina]

Merge current automatic branch (see debian/changelog for details)

Merge current automatic branch (see debian/changelog for details)

[lp:~ralsina/ubuntu-push/merge-automatic]

119. By Roberto Alsina on 2014-08-12

Roberto's branch + fixes to tests that failed in chroot.

=== modified file 'Makefile'
--- Makefile	2014-06-19 21:31:23 +0000
+++ Makefile	2014-08-11 21:30:50 +0000
@@ -13,6 +13,8 @@
 GODEPS += code.google.com/p/gosqlite/sqlite3
 GODEPS += code.google.com/p/go-uuid/uuid
 
+GOTEST := ./scripts/goctest
+
 TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
 TOBUILD = $(shell grep -lr '^package main')
 
@@ -40,10 +42,10 @@
 	$(GOPATH)/bin/godeps -t $(TOTEST) $(foreach i,$(TOBUILD),$(dir $(PROJECT)/$(i))) 2>/dev/null | cat > $@
 
 check:
-	go test $(TESTFLAGS) $(TOTEST)
+	$(GOTEST) $(TESTFLAGS) $(TOTEST)
 
 check-race:
-	go test $(TESTFLAGS) -race $(TOTEST)
+	$(GOTEST) $(TESTFLAGS) -race $(TOTEST)
 
 acceptance:
 	cd server/acceptance; ./acceptance.sh
@@ -83,14 +85,14 @@
 	bzr clean-tree --verbose --ignored --force
 
 coverage-summary:
-	go test $(TESTFLAGS) -a -cover $(TOTEST)
+	$(GOTEST) $(TESTFLAGS) -a -cover $(TOTEST)
 
 coverage-html:
 	mkdir -p coverhtml
 	for pkg in $(TOTEST); do \
 		relname="$${pkg#$(PROJECT)/}" ; \
 		mkdir -p coverhtml/$$(dirname $${relname}) ; \
-		go test $(TESTFLAGS) -a -coverprofile=coverhtml/$${relname}.out $$pkg ; \
+		$(GOTEST) $(TESTFLAGS) -a -coverprofile=coverhtml/$${relname}.out $$pkg ; \
 		if [ -f coverhtml/$${relname}.out ] ; then \
 	           go tool cover -html=coverhtml/$${relname}.out -o coverhtml/$${relname}.html ; \
 	           go tool cover -func=coverhtml/$${relname}.out -o coverhtml/$${relname}.txt ; \

=== modified file 'bus/haptic/haptic.go'
--- bus/haptic/haptic.go	2014-07-25 10:25:59 +0000
+++ bus/haptic/haptic.go	2014-08-11 21:30:50 +0000
@@ -34,13 +34,14 @@
 
 // Haptic encapsulates info needed to call out to usensord/haptic
 type Haptic struct {
-	bus bus.Endpoint
-	log logger.Logger
+	bus      bus.Endpoint
+	log      logger.Logger
+	fallback *launch_helper.Vibration
 }
 
 // New returns a new Haptic that'll use the provided bus.Endpoint
-func New(endp bus.Endpoint, log logger.Logger) *Haptic {
-	return &Haptic{endp, log}
+func New(endp bus.Endpoint, log logger.Logger, fallback *launch_helper.Vibration) *Haptic {
+	return &Haptic{endp, log, fallback}
 }
 
 // Present presents the notification via a vibrate pattern
@@ -49,18 +50,16 @@
 		panic("please check notification is not nil before calling present")
 	}
 
-	if notification.Vibrate == nil {
-		haptic.log.Debugf("[%s] notification has no Vibrate: %#v", nid, notification.Vibrate)
+	vib := notification.Vibration(haptic.fallback)
+	if vib == nil {
+		haptic.log.Debugf("[%s] notification has no Vibrate.", nid)
 		return false
 	}
-	pattern := notification.Vibrate.Pattern
-	repeat := notification.Vibrate.Repeat
+	pattern := vib.Pattern
+	repeat := vib.Repeat
 	if repeat == 0 {
 		repeat = 1
 	}
-	if notification.Vibrate.Duration != 0 {
-		pattern = []uint32{notification.Vibrate.Duration}
-	}
 	if len(pattern) == 0 {
 		haptic.log.Debugf("[%s] not enough information in the Vibrate to create a pattern", nid)
 		return false

=== modified file 'bus/haptic/haptic_test.go'
--- bus/haptic/haptic_test.go	2014-07-25 10:25:59 +0000
+++ bus/haptic/haptic_test.go	2014-08-11 21:30:50 +0000
@@ -17,6 +17,7 @@
 package haptic
 
 import (
+	"encoding/json"
 	"testing"
 
 	. "launchpad.net/gocheck"
@@ -47,8 +48,8 @@
 func (hs *hapticSuite) TestPresentPresents(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
 
-	ec := New(endp, hs.log)
-	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Pattern: []uint32{200, 100}, Repeat: 2}}
+	ec := New(endp, hs.log, nil)
+	notif := launch_helper.Notification{RawVibration: json.RawMessage(`{"pattern": [200, 100], "repeat": 2}`)}
 	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
@@ -60,9 +61,9 @@
 func (hs *hapticSuite) TestPresentDefaultsRepeatTo1(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
 
-	ec := New(endp, hs.log)
+	ec := New(endp, hs.log, nil)
 	// note: no Repeat:
-	notif := launch_helper.Notification{Vibrate: &launch_helper.Vibration{Pattern: []uint32{200, 100}}}
+	notif := launch_helper.Notification{RawVibration: json.RawMessage(`{"pattern": [200, 100]}`)}
 	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
 	callArgs := testibus.GetCallArgs(endp)
 	c.Assert(callArgs, HasLen, 1)
@@ -71,52 +72,40 @@
 	c.Check(callArgs[0].Args, DeepEquals, []interface{}{[]uint32{200, 100}, uint32(1)})
 }
 
-// check that Present() makes a Pattern of [Duration] if Duration is given
-func (hs *hapticSuite) TestPresentBuildsPatternWithDuration(c *C) {
-	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
-
-	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)
-	callArgs := testibus.GetCallArgs(endp)
-	c.Assert(callArgs, HasLen, 1)
-	c.Check(callArgs[0].Member, Equals, "VibratePattern")
-	// note: Pattern of [Duration], Repeat of 1:
-	c.Check(callArgs[0].Args, DeepEquals, []interface{}{[]uint32{200}, uint32(1)})
-}
-
-// check that Present() ignores Pattern and makes a Pattern of [Duration] if Duration is given
-func (hs *hapticSuite) TestPresentOverrides(c *C) {
-	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
-
-	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)
-	callArgs := testibus.GetCallArgs(endp)
-	c.Assert(callArgs, HasLen, 1)
-	c.Check(callArgs[0].Member, Equals, "VibratePattern")
-	// note: Pattern of [Duration], Repeat of 1:
-	c.Check(callArgs[0].Args, DeepEquals, []interface{}{[]uint32{200}, uint32(1)})
-}
-
 // check that Present() doesn't call VibratePattern if things are not right
 func (hs *hapticSuite) TestSkipIfMissing(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
 
-	ec := New(endp, hs.log)
+	ec := New(endp, hs.log, nil)
 	// no Vibration in the notificaton
 	c.Check(ec.Present(hs.app, "", &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, "", &launch_helper.Notification{RawVibration: nil}), Equals, false)
+	// empty empty vibration
+	c.Check(ec.Present(hs.app, "", &launch_helper.Notification{RawVibration: json.RawMessage(`{}`)}), Equals, false)
 }
 
 // check that Present() panics if the notification is nil
 func (hs *hapticSuite) TestPanicsIfNil(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
 
-	ec := New(endp, hs.log)
+	ec := New(endp, hs.log, nil)
 	// no notification at all
 	c.Check(func() { ec.Present(hs.app, "", nil) }, Panics, `please check notification is not nil before calling present`)
 }
+
+// check that Present() uses the fallback if appropriate
+func (hs *hapticSuite) TestPresentPresentsFallback(c *C) {
+	endp := testibus.NewTestingEndpoint(nil, condition.Work(true))
+	fallback := &launch_helper.Vibration{Pattern: []uint32{200, 100}, Repeat: 2}
+
+	ec := New(endp, hs.log, fallback)
+	notif := launch_helper.Notification{RawVibration: json.RawMessage(`false`)}
+	c.Check(ec.Present(hs.app, "nid", &notif), Equals, false)
+	notif = launch_helper.Notification{RawVibration: json.RawMessage(`true`)}
+	c.Check(ec.Present(hs.app, "nid", &notif), Equals, true)
+	callArgs := testibus.GetCallArgs(endp)
+	c.Assert(callArgs, HasLen, 1)
+	c.Check(callArgs[0].Member, Equals, "VibratePattern")
+	c.Check(callArgs[0].Args, DeepEquals, []interface{}{[]uint32{200, 100}, uint32(2)})
+}

=== modified file 'click/click.go'
--- click/click.go	2014-07-29 15:36:00 +0000
+++ click/click.go	2014-08-11 21:30:50 +0000
@@ -51,7 +51,7 @@
 
 var (
 	ErrInvalidAppId = errors.New("invalid application id")
-	ErrMissingAppId = errors.New("missing application id")
+	ErrMissingApp   = errors.New("application not installed")
 )
 
 func ParseAppId(id string) (*AppId, error) {
@@ -161,14 +161,14 @@
 
 // ParseAndVerifyAppId parses the given app id and checks if the
 // corresponding app is installed, returning the parsed id or
-// ErrInvalidAppId, or the parsed id and ErrMissingAppId respectively.
+// ErrInvalidAppId, or the parsed id and ErrMissingApp respectively.
 func ParseAndVerifyAppId(id string, installedChecker InstalledChecker) (*AppId, error) {
 	app, err := ParseAppId(id)
 	if err != nil {
 		return nil, err
 	}
 	if installedChecker != nil && !installedChecker.Installed(app, true) {
-		return app, ErrMissingAppId
+		return app, ErrMissingApp
 	}
 	return app, nil
 }

=== modified file 'click/click_test.go'
--- click/click_test.go	2014-07-29 15:36:00 +0000
+++ click/click_test.go	2014-08-11 21:30:50 +0000
@@ -178,7 +178,7 @@
 	c.Check(app.Application, Equals, "baz")
 
 	app, err = ParseAndVerifyAppId("_non-existent-app", u)
-	c.Assert(err, Equals, ErrMissingAppId)
+	c.Assert(err, Equals, ErrMissingApp)
 	c.Check(app, NotNil)
 	c.Check(app.Original(), Equals, "_non-existent-app")
 }

=== modified file 'client/client.go'
--- client/client.go	2014-07-21 17:38:28 +0000
+++ client/client.go	2014-08-11 21:30:50 +0000
@@ -41,10 +41,11 @@
 	"launchpad.net/ubuntu-push/client/session"
 	"launchpad.net/ubuntu-push/client/session/seenstate"
 	"launchpad.net/ubuntu-push/config"
+	"launchpad.net/ubuntu-push/identifier"
+	"launchpad.net/ubuntu-push/launch_helper"
 	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/protocol"
 	"launchpad.net/ubuntu-push/util"
-	"launchpad.net/ubuntu-push/whoopsie/identifier"
 )
 
 // ClientConfig holds the client configuration
@@ -67,6 +68,9 @@
 	RegistrationURL string `json:"registration_url"`
 	// The logging level (one of "debug", "info", "error")
 	LogLevel logger.ConfigLogLevel `json:"log_level"`
+	// fallback values for simplified notification usage
+	FallbackVibration *launch_helper.Vibration `json:"fallback_vibration"`
+	FallbackSound     string                   `json:"fallback_sound"`
 }
 
 // PushService is the interface we use of service.PushService.
@@ -152,7 +156,10 @@
 	client.unregisterCh = make(chan *click.AppId, 10)
 
 	// overridden for testing
-	client.idder = identifier.New()
+	client.idder, err = identifier.New()
+	if err != nil {
+		return err
+	}
 	client.connectivityEndp = bus.SystemBus.Endpoint(networkmanager.BusAddress, client.log)
 	client.systemImageEndp = bus.SystemBus.Endpoint(systemimage.BusAddress, client.log)
 
@@ -203,6 +210,15 @@
 	return setup, nil
 }
 
+// derivePostalServiceSetup derives the service setup from the client configuration bits.
+func (client *PushClient) derivePostalServiceSetup() *service.PostalServiceSetup {
+	return &service.PostalServiceSetup{
+		InstalledChecker:  client.installedChecker,
+		FallbackVibration: client.config.FallbackVibration,
+		FallbackSound:     client.config.FallbackSound,
+	}
+}
+
 // getAuthorization gets the authorization blob to send to the server
 func (client *PushClient) getAuthorization(url string) string {
 	client.log.Debugf("getting authorization for %s", url)
@@ -222,16 +238,12 @@
 	}
 }
 
-// getDeviceId gets the whoopsie identifier for the device
+// getDeviceId gets the identifier for the device
 func (client *PushClient) getDeviceId() error {
-	err := client.idder.Generate()
-	if err != nil {
-		return err
-	}
 	baseId := client.idder.String()
 	b, err := hex.DecodeString(baseId)
 	if err != nil {
-		return fmt.Errorf("whoopsie id should be hex: %v", err)
+		return fmt.Errorf("machine-id should be hex: %v", err)
 	}
 	h := sha256.Sum224(b)
 	client.deviceId = base64.StdEncoding.EncodeToString(h[:])
@@ -294,7 +306,7 @@
 	switch err {
 	default:
 		client.log.Debugf("notification %#v for invalid app id %#v.", notif.MsgId, notif.AppId)
-	case click.ErrMissingAppId:
+	case click.ErrMissingApp:
 		client.log.Debugf("notification %#v for missing app id %#v.", notif.MsgId, notif.AppId)
 		client.unregisterCh <- parsed
 		parsed = nil
@@ -473,7 +485,8 @@
 }
 
 func (client *PushClient) setupPostalService() error {
-	client.postalService = service.NewPostalService(client.installedChecker, client.log)
+	setup := client.derivePostalServiceSetup()
+	client.postalService = service.NewPostalService(setup, client.log)
 	return nil
 }
 

=== modified file 'client/client_test.go'
--- client/client_test.go	2014-07-21 17:38:28 +0000
+++ client/client_test.go	2014-08-11 21:30:50 +0000
@@ -42,12 +42,13 @@
 	"launchpad.net/ubuntu-push/client/session"
 	"launchpad.net/ubuntu-push/client/session/seenstate"
 	"launchpad.net/ubuntu-push/config"
+	"launchpad.net/ubuntu-push/identifier"
+	idtesting "launchpad.net/ubuntu-push/identifier/testing"
+	"launchpad.net/ubuntu-push/launch_helper"
 	"launchpad.net/ubuntu-push/protocol"
 	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"launchpad.net/ubuntu-push/util"
-	"launchpad.net/ubuntu-push/whoopsie/identifier"
-	idtesting "launchpad.net/ubuntu-push/whoopsie/identifier/testing"
 )
 
 func TestClient(t *testing.T) { TestingT(t) }
@@ -154,6 +155,8 @@
 func (cs *clientSuite) writeTestConfig(overrides map[string]interface{}) {
 	pem_file := helpers.SourceRelative("../server/acceptance/ssl/testing.cert")
 	cfgMap := map[string]interface{}{
+		"fallback_vibration":     &launch_helper.Vibration{Pattern: []uint32{1}},
+		"fallback_sound":         "sounds/ubuntu/notifications/Blip.ogg",
 		"connect_timeout":        "7ms",
 		"exchange_timeout":       "10ms",
 		"hosts_cache_expiry":     "1h",
@@ -239,7 +242,8 @@
 	c.Check(cli.idder, IsNil)
 	err := cli.configure()
 	c.Assert(err, IsNil)
-	c.Assert(cli.idder, FitsTypeOf, identifier.New())
+	newIdder, err := identifier.New()
+	c.Assert(cli.idder, FitsTypeOf, newIdder)
 }
 
 func (cs *clientSuite) TestConfigureSetsUpEndpoints(c *C) {
@@ -471,6 +475,32 @@
 }
 
 /*****************************************************************
+    derivePostalConfig tests
+******************************************************************/
+func (cs *clientSuite) TestDerivePostalServiceSetup(c *C) {
+	cs.writeTestConfig(map[string]interface{}{})
+	cli := NewPushClient(cs.configPath, cs.leveldbPath)
+	err := cli.configure()
+	c.Assert(err, IsNil)
+	expected := &service.PostalServiceSetup{
+		InstalledChecker:  cli.installedChecker,
+		FallbackVibration: cli.config.FallbackVibration,
+		FallbackSound:     cli.config.FallbackSound,
+	}
+	// sanity check that we are looking at all fields
+	vExpected := reflect.ValueOf(expected).Elem()
+	nf := vExpected.NumField()
+	for i := 0; i < nf; i++ {
+		fv := vExpected.Field(i)
+		// field isn't empty/zero
+		c.Assert(fv.Interface(), Not(DeepEquals), reflect.Zero(fv.Type()).Interface(), Commentf("forgot about: %s", vExpected.Type().Field(i).Name))
+	}
+	// finally compare
+	setup := cli.derivePostalServiceSetup()
+	c.Check(setup, DeepEquals, expected)
+}
+
+/*****************************************************************
     startService tests
 ******************************************************************/
 
@@ -536,7 +566,7 @@
 func (cs *clientSuite) TestGetDeviceIdWorks(c *C) {
 	cli := NewPushClient(cs.configPath, cs.leveldbPath)
 	cli.log = cs.log
-	cli.idder = identifier.New()
+	cli.idder, _ = identifier.New()
 	c.Check(cli.deviceId, Equals, "")
 	c.Check(cli.getDeviceId(), IsNil)
 	c.Check(cli.deviceId, HasLen, 40)
@@ -550,14 +580,14 @@
 	c.Check(cli.getDeviceId(), NotNil)
 }
 
-func (cs *clientSuite) TestGetDeviceIdWhoopsieDoesTheUnexpected(c *C) {
+func (cs *clientSuite) TestGetDeviceIdIdentifierDoesTheUnexpected(c *C) {
 	cli := NewPushClient(cs.configPath, cs.leveldbPath)
 	cli.log = cs.log
 	settable := idtesting.Settable()
 	cli.idder = settable
 	settable.Set("not-hex")
 	c.Check(cli.deviceId, Equals, "")
-	c.Check(cli.getDeviceId(), ErrorMatches, "whoopsie id should be hex: .*")
+	c.Check(cli.getDeviceId(), ErrorMatches, "machine-id should be hex: .*")
 }
 
 /*****************************************************************
@@ -1111,7 +1141,7 @@
 	// and now everthing is better! We have a config,
 	c.Check(string(cli.config.Addr), Equals, ":0")
 	// and a device id,
-	c.Check(cli.deviceId, HasLen, 40)
+	c.Check(cli.deviceId, HasLen, 32)
 	// and a session,
 	c.Check(cli.session, NotNil)
 	// and a bus,

=== modified file 'client/service/common.go'
--- client/service/common.go	2014-07-15 20:53:41 +0000
+++ client/service/common.go	2014-08-11 21:30:50 +0000
@@ -52,7 +52,7 @@
 	ErrBadArgCount    = errors.New("wrong number of arguments")
 	ErrBadArgType     = errors.New("bad argument type")
 	ErrBadJSON        = errors.New("bad json data")
-	ErrBadAppId       = errors.New("package must be prefix of app id")
+	ErrAppIdMismatch  = errors.New("package must be prefix of app id")
 )
 
 // IsRunning() returns whether the service's state is StateRunning
@@ -118,10 +118,10 @@
 	pkgname := string(nih.Unquote([]byte(path[strings.LastIndex(path, "/")+1:])))
 	app, err = click.ParseAndVerifyAppId(id, svc.installedChecker)
 	if err != nil {
-		return nil, ErrBadAppId
+		return nil, err
 	}
 	if !app.InPackage(pkgname) {
-		return nil, ErrBadAppId
+		return nil, ErrAppIdMismatch
 	}
 	return
 }

=== modified file 'client/service/common_test.go'
--- client/service/common_test.go	2014-07-08 08:32:32 +0000
+++ client/service/common_test.go	2014-08-11 21:30:50 +0000
@@ -18,6 +18,8 @@
 
 import (
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/ubuntu-push/click"
 )
 
 type commonSuite struct{}
@@ -35,10 +37,16 @@
 	c.Check(app.Original(), Equals, anAppId)
 }
 
+type fakeInstalledChecker struct{}
+
+func (fakeInstalledChecker) Installed(app *click.AppId, setVersion bool) bool {
+	return app.Original()[0] == 'c'
+}
+
 func (cs *commonSuite) TestGrabDBusPackageAndAppIdFails(c *C) {
 	svc := new(DBusService)
+	svc.installedChecker = fakeInstalledChecker{}
 	aDBusPath := "/com/ubuntu/Postal/com_2eexample_2etest"
-	aDBusPath2 := "/com/ubuntu/Postal/com_2efoo_2ebar"
 	aPackage := "com.example.test"
 	anAppId := aPackage + "_test"
 
@@ -52,8 +60,9 @@
 		{aDBusPath, []interface{}{anAppId}, 1, ErrBadArgCount},
 		{aDBusPath, []interface{}{anAppId, anAppId}, 0, ErrBadArgCount},
 		{aDBusPath, []interface{}{1}, 0, ErrBadArgType},
-		{aDBusPath, []interface{}{aPackage}, 0, ErrBadAppId},
-		{aDBusPath2, []interface{}{anAppId}, 0, ErrBadAppId},
+		{aDBusPath, []interface{}{aPackage}, 0, click.ErrInvalidAppId},
+		{aDBusPath, []interface{}{"x" + anAppId}, 0, click.ErrMissingApp},
+		{aDBusPath, []interface{}{"c" + anAppId}, 0, ErrAppIdMismatch},
 	} {
 		comment := Commentf("iteration #%d", i)
 		app, err := svc.grabDBusPackageAndAppId(s.path, s.args, s.numExtra)

=== modified file 'client/service/postal.go'
--- client/service/postal.go	2014-08-01 14:17:04 +0000
+++ client/service/postal.go	2014-08-11 21:30:50 +0000
@@ -56,6 +56,13 @@
 	Clear(*click.AppId, ...string) int
 }
 
+// PostalServiceSetup is a configuration object for the service
+type PostalServiceSetup struct {
+	InstalledChecker  click.InstalledChecker
+	FallbackVibration *launch_helper.Vibration
+	FallbackSound     string
+}
+
 // PostalService is the dbus api
 type PostalService struct {
 	DBusService
@@ -80,6 +87,9 @@
 	// the url dispatcher, used for stuff.
 	urlDispatcher urldispatcher.URLDispatcher
 	windowStack   *windowstack.WindowStack
+	// fallback values for simplified notification usage
+	fallbackVibration *launch_helper.Vibration
+	fallbackSound     string
 }
 
 var (
@@ -96,11 +106,13 @@
 )
 
 // NewPostalService() builds a new service and returns it.
-func NewPostalService(installedChecker click.InstalledChecker, log logger.Logger) *PostalService {
+func NewPostalService(setup *PostalServiceSetup, log logger.Logger) *PostalService {
 	var svc = &PostalService{}
 	svc.Log = log
 	svc.Bus = bus.SessionBus.Endpoint(PostalServiceBusAddress, log)
-	svc.installedChecker = installedChecker
+	svc.installedChecker = setup.InstalledChecker
+	svc.fallbackVibration = setup.FallbackVibration
+	svc.fallbackSound = setup.FallbackSound
 	svc.NotificationsEndp = bus.SessionBus.Endpoint(notifications.BusAddress, log)
 	svc.EmblemCounterEndp = bus.SessionBus.Endpoint(emblemcounter.BusAddress, log)
 	svc.HapticEndp = bus.SessionBus.Endpoint(haptic.BusAddress, log)
@@ -144,8 +156,8 @@
 	svc.urlDispatcher = urldispatcher.New(svc.URLDispatcherEndp, svc.Log)
 	svc.notifications = notifications.Raw(svc.NotificationsEndp, svc.Log)
 	svc.emblemCounter = emblemcounter.New(svc.EmblemCounterEndp, svc.Log)
-	svc.haptic = haptic.New(svc.HapticEndp, svc.Log)
-	svc.sound = sounds.New(svc.Log)
+	svc.haptic = haptic.New(svc.HapticEndp, svc.Log, svc.fallbackVibration)
+	svc.sound = sounds.New(svc.Log, svc.fallbackSound)
 	svc.messagingMenu = messaging.New(svc.Log)
 	svc.Presenters = []Presenter{
 		svc.notifications,

=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2014-08-01 14:17:04 +0000
+++ client/service/postal_test.go	2014-08-11 21:30:50 +0000
@@ -133,6 +133,7 @@
 
 type postalSuite struct {
 	log          *helpers.TestLogger
+	cfg          *PostalServiceSetup
 	bus          bus.Endpoint
 	notifBus     bus.Endpoint
 	counterBus   bus.Endpoint
@@ -160,6 +161,7 @@
 	ps.oldIsBlisted = isBlacklisted
 	isBlacklisted = func(*click.AppId) bool { return ps.blacklisted }
 	ps.log = helpers.NewTestLogger(c, "debug")
+	ps.cfg = &PostalServiceSetup{}
 	ps.bus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.notifBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.counterBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
@@ -204,7 +206,7 @@
 }
 
 func (ps *postalSuite) TestStart(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Check(svc.IsRunning(), Equals, false)
 	c.Check(svc.Start(), IsNil)
 	c.Check(svc.IsRunning(), Equals, true)
@@ -212,30 +214,30 @@
 }
 
 func (ps *postalSuite) TestStartTwice(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Check(svc.Start(), IsNil)
 	c.Check(svc.Start(), Equals, ErrAlreadyStarted)
 	svc.Stop()
 }
 
 func (ps *postalSuite) TestStartNoLog(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, nil))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, nil))
 	c.Check(svc.Start(), Equals, ErrNotConfigured)
 }
 
 func (ps *postalSuite) TestStartNoBus(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.Bus = nil
 	c.Check(svc.Start(), Equals, ErrNotConfigured)
 
-	svc = ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc = ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.NotificationsEndp = nil
 	c.Check(svc.Start(), Equals, ErrNotConfigured)
 }
 
 func (ps *postalSuite) TestTakeTheBusFail(c *C) {
 	nEndp := testibus.NewMultiValuedTestingEndpoint(condition.Work(true), condition.Work(false))
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.NotificationsEndp = nEndp
 	_, err := svc.takeTheBus()
 	c.Check(err, NotNil)
@@ -243,7 +245,7 @@
 
 func (ps *postalSuite) TestTakeTheBusOk(c *C) {
 	nEndp := testibus.NewMultiValuedTestingEndpoint(condition.Work(true), condition.Work(true), []interface{}{uint32(1), "hello"})
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.NotificationsEndp = nEndp
 	_, err := svc.takeTheBus()
 	c.Check(err, IsNil)
@@ -251,14 +253,14 @@
 
 func (ps *postalSuite) TestStartFailsOnBusDialFailure(c *C) {
 	// XXX actually, we probably want to autoredial this
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.Bus = testibus.NewTestingEndpoint(condition.Work(false), nil)
 	c.Check(svc.Start(), ErrorMatches, `.*(?i)cond said no.*`)
 	svc.Stop()
 }
 
 func (ps *postalSuite) TestStartGrabsName(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	callArgs := testibus.GetCallArgs(ps.bus)
 	defer svc.Stop()
@@ -267,7 +269,7 @@
 }
 
 func (ps *postalSuite) TestStopClosesBus(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	svc.Stop()
 	callArgs := testibus.GetCallArgs(ps.bus)
@@ -279,7 +281,7 @@
 // post() tests
 
 func (ps *postalSuite) TestPostHappyPath(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.msgHandler = nil
 	ch := installTickMessageHandler(svc)
 	svc.launchers = map[string]launch_helper.HelperLauncher{
@@ -322,7 +324,7 @@
 		{[]interface{}{anAppId, "zoom"}, ErrBadJSON},
 		{[]interface{}{1, "hello"}, ErrBadArgType},
 		{[]interface{}{1, 2, 3}, ErrBadArgCount},
-		{[]interface{}{"bar", "hello"}, ErrBadAppId},
+		{[]interface{}{"bar", "hello"}, click.ErrInvalidAppId},
 	} {
 		reg, err := new(PostalService).post(aPackageOnBus, s.args, nil)
 		c.Check(reg, IsNil, Commentf("iteration #%d", i))
@@ -333,7 +335,7 @@
 // Post() tests
 
 func (ps *postalSuite) TestPostWorks(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.msgHandler = nil
 	ch := installTickMessageHandler(svc)
 	fakeLauncher2 := &fakeHelperLauncher{ch: make(chan []byte)}
@@ -384,7 +386,7 @@
 
 func (ps *postalSuite) TestPostCallsMessageHandlerDetails(c *C) {
 	ch := make(chan *launch_helper.HelperOutput)
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.launchers = map[string]launch_helper.HelperLauncher{
 		"click": ps.fakeLauncher,
 	}
@@ -410,7 +412,7 @@
 }
 
 func (ps *postalSuite) TestAfterMessageHandlerSignal(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.msgHandler = nil
 
 	hInp := &launch_helper.HelperInput{
@@ -431,7 +433,7 @@
 }
 
 func (ps *postalSuite) TestFailingMessageHandlerSurvived(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.SetMessageHandler(func(*click.AppId, string, *launch_helper.HelperOutput) bool {
 		return false
 	})
@@ -453,7 +455,7 @@
 //
 // Notifications tests
 func (ps *postalSuite) TestNotificationsWorks(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	nots, err := svc.popAll(aPackageOnBus, []interface{}{anAppId}, nil)
 	c.Assert(err, IsNil)
 	c.Assert(nots, NotNil)
@@ -487,7 +489,7 @@
 		{nil, ErrBadArgCount},
 		{[]interface{}{}, ErrBadArgCount},
 		{[]interface{}{1}, ErrBadArgType},
-		{[]interface{}{"potato"}, ErrBadAppId},
+		{[]interface{}{"potato"}, click.ErrInvalidAppId},
 	} {
 		reg, err := new(PostalService).popAll(aPackageOnBus, s.args, nil)
 		c.Check(reg, IsNil, Commentf("iteration #%d", i))
@@ -510,7 +512,7 @@
 
 func (ps *postalSuite) TestMessageHandlerPresents(c *C) {
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), uint32(1))
-	svc := NewPostalService(nil, ps.log)
+	svc := NewPostalService(ps.cfg, ps.log)
 	svc.Bus = endp
 	svc.EmblemCounterEndp = endp
 	svc.HapticEndp = endp
@@ -518,13 +520,14 @@
 	svc.URLDispatcherEndp = ps.urlDispBus
 	svc.WindowStackEndp = ps.winStackBus
 	svc.launchers = map[string]launch_helper.HelperLauncher{}
+	svc.fallbackVibration = &launch_helper.Vibration{Pattern: []uint32{1}}
 	c.Assert(svc.Start(), IsNil)
 
 	// Persist is false so we just check the log
 	card := &launch_helper.Card{Icon: "icon-value", Summary: "summary-value", Body: "body-value", Popup: true, Persist: false}
-	vib := &launch_helper.Vibration{Duration: 500}
+	vib := json.RawMessage(`true`)
 	emb := &launch_helper.EmblemCounter{Count: 2, Visible: true}
-	output := &launch_helper.HelperOutput{Notification: &launch_helper.Notification{Card: card, EmblemCounter: emb, Vibrate: vib}}
+	output := &launch_helper.HelperOutput{Notification: &launch_helper.Notification{Card: card, EmblemCounter: emb, RawVibration: vib}}
 	b := svc.messageHandler(&click.AppId{}, "", output)
 	c.Assert(b, Equals, true)
 	args := testibus.GetCallArgs(endp)
@@ -547,7 +550,7 @@
 
 func (ps *postalSuite) TestMessageHandlerReportsFailedNotifies(c *C) {
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), 1)
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.NotificationsEndp = endp
 	c.Assert(svc.Start(), IsNil)
 	card := &launch_helper.Card{Icon: "icon-value", Summary: "summary-value", Body: "body-value", Popup: true}
@@ -559,7 +562,7 @@
 
 func (ps *postalSuite) TestMessageHandlerInhibition(c *C) {
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []windowstack.WindowsInfo{{0, "com.example.test_test-app", true, 0}})
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.WindowStackEndp = endp
 	c.Assert(svc.Start(), IsNil)
 	output := &launch_helper.HelperOutput{Notification: &launch_helper.Notification{}} // Doesn't matter
@@ -569,7 +572,7 @@
 }
 
 func (ps *postalSuite) TestMessageHandlerReportsButIgnoresUnmarshalErrors(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	output := &launch_helper.HelperOutput{[]byte(`broken`), nil}
 	b := svc.messageHandler(nil, "", output)
@@ -579,7 +582,7 @@
 
 func (ps *postalSuite) TestMessageHandlerReportsButIgnoresNilNotifies(c *C) {
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false))
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	svc.NotificationsEndp = endp
 	output := &launch_helper.HelperOutput{[]byte(`{}`), nil}
@@ -589,7 +592,7 @@
 }
 
 func (ps *postalSuite) TestMessageHandlerInvalidAction(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false), []string{"com.example.test_test-app"})
 	svc.URLDispatcherEndp = endp
 	c.Assert(svc.Start(), IsNil)
@@ -601,7 +604,7 @@
 }
 
 func (ps *postalSuite) TestHandleActionsDispatches(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	fmm := new(fakeMM)
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	c.Assert(svc.Start(), IsNil)
@@ -627,7 +630,7 @@
 }
 
 func (ps *postalSuite) TestHandleMMUActionsDispatches(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	aCh := make(chan *notifications.RawAction)
@@ -650,7 +653,7 @@
 }
 
 func (ps *postalSuite) TestValidateActions(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"com.example.test_test-app_0"})
 	svc.URLDispatcherEndp = endp
 	c.Assert(svc.Start(), IsNil)
@@ -661,7 +664,7 @@
 }
 
 func (ps *postalSuite) TestValidateActionsNoActions(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	card := launch_helper.Card{}
 	notif := &launch_helper.Notification{Card: &card}
 	b := svc.validateActions(clickhelp.MustParseAppId("com.example.test_test-app_0"), notif)
@@ -669,7 +672,7 @@
 }
 
 func (ps *postalSuite) TestValidateActionsNoCard(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	notif := &launch_helper.Notification{}
 	b := svc.validateActions(clickhelp.MustParseAppId("com.example.test_test-app_0"), notif)
 	c.Check(b, Equals, true)
@@ -695,7 +698,7 @@
 }
 
 func (ps *postalSuite) TestListPersistent(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	fmm := new(fakeMM)
 	svc.messagingMenu = fmm
 
@@ -709,17 +712,24 @@
 }
 
 func (ps *postalSuite) TestListPersistentErrors(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
-	_, err := svc.listPersistent(aPackageOnBus, nil, nil)
-	c.Check(err, Equals, ErrBadArgCount)
-	_, err = svc.listPersistent(aPackageOnBus, []interface{}{42}, nil)
-	c.Check(err, Equals, ErrBadArgType)
-	_, err = svc.listPersistent(aPackageOnBus, []interface{}{"xyzzy"}, nil)
-	c.Check(err, Equals, ErrBadAppId)
+	for i, s := range []struct {
+		args []interface{}
+		errt error
+	}{
+		{nil, ErrBadArgCount},
+		{[]interface{}{}, ErrBadArgCount},
+		{[]interface{}{1}, ErrBadArgType},
+		{[]interface{}{anAppId, 2}, ErrBadArgCount},
+		{[]interface{}{"bar"}, click.ErrInvalidAppId},
+	} {
+		reg, err := new(PostalService).listPersistent(aPackageOnBus, s.args, nil)
+		c.Check(reg, IsNil, Commentf("iteration #%d", i))
+		c.Check(err, Equals, s.errt, Commentf("iteration #%d", i))
+	}
 }
 
 func (ps *postalSuite) TestClearPersistent(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	fmm := new(fakeMM)
 	svc.messagingMenu = fmm
 
@@ -730,24 +740,23 @@
 }
 
 func (ps *postalSuite) TestClearPersistentErrors(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
 	for i, s := range []struct {
 		args []interface{}
 		err  error
 	}{
 		{[]interface{}{}, ErrBadArgCount},
 		{[]interface{}{42}, ErrBadArgType},
-		{[]interface{}{"xyzzy"}, ErrBadAppId},
+		{[]interface{}{"xyzzy"}, click.ErrInvalidAppId},
 		{[]interface{}{anAppId, 42}, ErrBadArgType},
 		{[]interface{}{anAppId, "", 42}, ErrBadArgType},
 	} {
-		_, err := svc.clearPersistent(aPackageOnBus, s.args, nil)
+		_, err := new(PostalService).clearPersistent(aPackageOnBus, s.args, nil)
 		c.Check(err, Equals, s.err, Commentf("iter %d", i))
 	}
 }
 
 func (ps *postalSuite) TestSetCounter(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Check(svc.Start(), IsNil)
 
 	_, err := svc.setCounter(aPackageOnBus, []interface{}{anAppId, int32(42), true}, nil)
@@ -765,8 +774,9 @@
 }
 
 func (ps *postalSuite) TestSetCounterErrors(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.Start()
+
 	for i, s := range []struct {
 		args []interface{}
 		err  error
@@ -776,7 +786,7 @@
 		{[]interface{}{anAppId}, ErrBadArgCount},
 		{[]interface{}{anAppId, int32(42)}, ErrBadArgCount},
 		{[]interface{}{anAppId, int32(42), true, "potato"}, ErrBadArgCount},
-		{[]interface{}{"xyzzy", int32(42), true}, ErrBadAppId},
+		{[]interface{}{"xyzzy", int32(42), true}, click.ErrInvalidAppId},
 		{[]interface{}{1234567, int32(42), true}, ErrBadArgType},
 		{[]interface{}{anAppId, "potatoe", true}, ErrBadArgType},
 		{[]interface{}{anAppId, int32(42), "ru"}, ErrBadArgType},
@@ -787,7 +797,7 @@
 }
 
 func (ps *postalSuite) TestBlacklisted(c *C) {
-	svc := ps.replaceBuses(NewPostalService(nil, ps.log))
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.Start()
 	ps.blacklisted = false
 

=== modified file 'client/service/service_test.go'
--- client/service/service_test.go	2014-07-14 19:51:43 +0000
+++ client/service/service_test.go	2014-08-11 21:30:50 +0000
@@ -28,6 +28,7 @@
 
 	"launchpad.net/ubuntu-push/bus"
 	testibus "launchpad.net/ubuntu-push/bus/testing"
+	"launchpad.net/ubuntu-push/click"
 	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/nih"
 	helpers "launchpad.net/ubuntu-push/testing"
@@ -162,7 +163,7 @@
 		{nil, ErrBadArgCount},
 		{[]interface{}{}, ErrBadArgCount},
 		{[]interface{}{1}, ErrBadArgType},
-		{[]interface{}{"foo"}, ErrBadAppId},
+		{[]interface{}{"foo"}, click.ErrInvalidAppId},
 		{[]interface{}{"foo", "bar"}, ErrBadArgCount},
 	} {
 		reg, err := new(PushService).register("/bar", s.args, nil)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-04 15:38:34 +0000
+++ debian/changelog	2014-08-11 21:30:50 +0000
@@ -1,3 +1,25 @@
+ubuntu-push (0.61) UNRELEASED; urgency=medium
+
+  [ Guillermo Gonzalez ]
+  * Update autopilot tests to work with 0.50, fix setup.sh issues and add new tests for the broadcast notification changes.
+  * Replace whoopsie with /var/lib/dbus/machine-id to get the device ID.
+
+  [ John R. Lenton]
+  * Support simpler sounds API.
+  * Support simpler vibrations API.
+  * Remove Vibration's confusing and redundant Duration attribute.
+  * Change PostalService's New() to take a setup object.
+  * goctest.
+  * Make messaging menu entries show current time instead of epoch for timestamp of 0.
+  * Tweak the upstart script, start after unity.
+  * Correctly report invalid app ids, missing apps, and package/app id mismatches as separate errors over dbus.
+  
+  [Roberto Alsina]
+  * Check that sound paths don't go up into the tree.
+  * Initial draft of QML-based doc
+
+ -- Roberto Alsina <ralsina@yoga>  Mon, 11 Aug 2014 18:23:32 -0300
+
 ubuntu-push (0.60+14.10.20140804-0ubuntu1) utopic; urgency=medium
 
   [ Guillermo Gonzalez ]

=== modified file 'debian/config.json'
--- debian/config.json	2014-07-03 13:59:15 +0000
+++ debian/config.json	2014-08-11 21:30:50 +0000
@@ -12,5 +12,7 @@
     "recheck_timeout": "10m",
     "connectivity_check_url": "http://start.ubuntu.com/connectivity-check.html",
     "connectivity_check_md5": "4589f42e1546aa47ca181e5d949d310b",
-    "log_level": "debug"
+    "log_level": "debug",
+    "fallback_vibration": {"pattern": [100, 100], "repeat": 2},
+    "fallback_sound": "sounds/ubuntu/notifications/Slick.ogg"
 }

=== modified file 'debian/ubuntu-push-client.conf'
--- debian/ubuntu-push-client.conf	2014-06-02 10:01:13 +0000
+++ debian/ubuntu-push-client.conf	2014-08-11 21:30:50 +0000
@@ -1,7 +1,9 @@
 description "ubuntu push notification client-side daemon"
 
-start on started dbus
-stop on stopped dbus
+start on started unity8
+stop on stopping unity8
 
 exec /usr/lib/ubuntu-push-client/ubuntu-push-client
 respawn
+
+post-stop exec initctl emit untrusted-helper-type-end HELPER_TYPE=push-helper

=== added file 'docs/highlevel.txt'
--- docs/highlevel.txt	1970-01-01 00:00:00 +0000
+++ docs/highlevel.txt	2014-08-11 21:30:50 +0000
@@ -0,0 +1,325 @@
+Ubuntu Push Client Developer Guide
+==================================
+
+:Version: 0.50+
+
+Introduction
+------------
+
+This document describes how to use the Ubuntu Push Client service from the point of view of a developer writing
+a QML-based application.
+
+---------
+
+Let's describe the push system by way of an example.
+
+Alice has written a chat application called Chatter. Using it, Bob can send messages to Carol and viceversa. Alice has a
+web application for it, so the way it works now is that Bob connects to the service, posts a message, and when Carol
+connects, she gets it. If Carol leaves the browser window open, it beeps when messages arrive.
+
+Now Alice wants to create an Ubuntu Touch app for Chatter, so she implements the same architecture using a client that
+does the same thing as the web browser. Sadly, since applications on Ubuntu Touch don't run continuously, messages are
+only delivered when Carol opens the app, and the user experience suffers.
+
+Using the Ubuntu Push Server, this problem is alleviated: the Chatter server will deliver the messages to the Ubuntu
+Push Server, which in turn will send it in an efficient manner to the Ubuntu Push Client running in Bob and Carol's
+devices. The user sees a notification (all without starting the app) and then can launch it if he's interested in
+reading messages at that point.
+
+Since the app is not started and messages are delivered oportunistically, this is both battery and bandwidth-efficient.
+
+.. figure:: push.svg
+
+The Ubuntu Push system provides:
+
+* A push server which receives **push messages** from the app servers, queues them and delivers them efficiently
+  to the devices.
+* A push client which receives those messages, queues messages to the app and displays notifications to the user
+
+The full lifecycle of a push message is:
+
+* Created in a application-specific server
+* Sent to the Ubuntu Push server, targeted at a user or user+device pair
+* Delivered to one or more Ubuntu devices
+* Passed through the application helper for processing
+* Notification displayed to the user (via different mechanisms)
+* Application Message queued for the app's use
+
+If the user interacts with the notification, the application is launched and should check its queue for messages
+it has to process.
+
+For the app developer, there are several components needed:
+
+* A server that sends the **push messages** to the Ubuntu Push server
+* Support in the client app for registering with the Ubuntu Push client
+* Support in the client app to react to **notifications** displayed to the user and process **application messages**
+* A helper program with application-specific knowledge that transforms **push messages** as needed.
+
+In the following sections, we'll see how to implement all the client side parts. For the application server, see the
+`Ubuntu Push Server API section <#ubuntu-push-server-api>`__
+
+The PushClient Component
+------------------------
+
+Example::
+
+    import Ubuntu.PushNotifications 0.1
+
+    PushClient {
+        id: pushClient
+        Component.onCompleted: {
+            newNotifications.connect(messageList.handle_notifications)
+            error.connect(messageList.handle_error)
+        }
+        appId: "com.ubuntu.developer.push.hello_hello"
+    }
+
+Registration: the appId and token properties
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To register with the push system and start receiving notifications, set the ``appId`` property to your application's APP_ID,
+with or without version number. For this to succeed the user **must** have an Ubuntu One account configured in the device.
+
+The APP_ID is as described in the `ApplicationId documentation <https://wiki.ubuntu.com/AppStore/Interfaces/ApplicationId>`__
+except that the version is treated as optional. Therefore both ``com.ubuntu.music_music`` and ``com.ubuntu.music_music_1.3.496``
+are valid. Keep in mind that while both versioned and unversioned APP_IDs are valid, they are still different and will affect
+which notifications are delivered to the application. Unversioned IDs mean the token will be the same after updates and the application
+will receive old notifications, while versioned IDs mean the app needs to explicitly ask to get older messages delivered.
+
+Setting the same appId more than once has no effect.
+
+After you are registered, if no error occurs, the PushClient will have a value set in its ``token`` property
+which uniquely identifies the user+device combination.
+
+Receiving Notifications
+~~~~~~~~~~~~~~~~~~~~~~~
+
+When a notification is received by the Push Client, it will be delivered to your application's push helper, and then
+placed in your application's mailbox. At that point, the PushClient will emit the ``newNotifications(QStringList)`` signal
+containing your messages. You should probably connect to that signal and handle those messages.
+
+Because of the application's lifecycle, there is no guarantee that it will be running when the signal is emitted. For that
+reason, apps should check for pending notifications whenever they are activated or started. To do that, use the
+``getNotifications()`` slot. Triggering that slot will fetch notifications and trigger the
+``newNotifications(QStringList)`` signal.
+
+Error Handling
+~~~~~~~~~~~~~~
+
+Whenever PushClient suffers an error, it will emit the ``error(QString)`` signal with the error message.
+
+Persistent Notification Management
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Some notifications are persistent, meaning they don't disappear automatically. For those notifications, there is an API that
+allows the app to manage them without having to know the underlying details of the platform.
+
+On each notification there's an optional ``tag`` field, used for this purpose.
+
+The ``persistent`` property of PushClient contains the list of the tags of notifications with the "persist" element set
+to true that are visible to the user right now.
+
+The ``void clearPersistent(QStringList tags)`` method clears persistent notifications for that app marked by ``tags``.
+If no tag is given, match all.
+
+
+The ``count`` property sets the counter in the application's icon to the given value.
+
+
+Application Helpers
+-------------------
+
+The payload delivered to push-client will be passed onto a helper program that can modify it as needed before passing it onto
+the postal service (see `Helper Output Format <#helper-output-format>`__).
+
+The helper receives two arguments ``infile`` and ``outfile``. The message is delivered via ``infile`` and the transformed
+version is placed in ``outfile``.
+
+This is the simplest possible useful helper, which simply passes the message through unchanged::
+
+	#!/usr/bin/python3
+
+	import sys
+	f1, f2 = sys.argv[1:3]
+	open(f2, "w").write(open(f1).read())
+
+Helpers need to be added to the click package manifest::
+
+	{
+		"name": "com.ubuntu.developer.ralsina.hello",
+		"description": "description of hello",
+		"framework": "ubuntu-sdk-14.10-qml-dev2",
+		"architecture": "all",
+		"title": "hello",
+		"hooks": {
+			"hello": {
+				"apparmor": "hello.json",
+				"desktop": "hello.desktop"
+			},
+			"helloHelper": {
+				"apparmor": "helloHelper-apparmor.json",
+				"push-helper": "helloHelper.json"
+			}
+		},
+		"version": "0.2",
+		"maintainer": "Roberto Alsina <[e-mail]>"
+	}
+
+Here, we created a helloHelper entry in hooks that has an apparmor profile and an additional JSON file for the push-helper hook.
+
+helloHelper-apparmor.json must contain **only** the push-notification-client policy group::
+
+	{
+		"policy_groups": [
+			"push-notification-client"
+		],
+		"policy_version": 1.2
+	}
+
+And helloHelper.json must have at least a exec key with the path to the helper executable relative to the json, and optionally
+an app_id key containing the short id of one of the apps in the package (in the format packagename_appname without a version).
+If the app_id is not specified, the helper will be used for all apps in the package::
+
+	{
+		"exec": "helloHelper",
+		"app_id": "com.ubuntu.developer.ralsina.hello_hello"
+	}
+
+.. note:: For deb packages, helpers should be installed into /usr/lib/ubuntu-push-client/legacy-helpers/ as part of the package.
+
+Helper Output Format
+--------------------
+
+Helpers output has two parts, the postal message (in the "message" key) and a notification to be presented to the user (in the "notification" key).
+
+Here's a simple example::
+
+	{
+		"message": "foobar",
+		"notification": {
+			"tag": "foo",
+			"card": {
+				"summary": "yes",
+				"body": "hello",
+				"popup": true,
+				"persist": true,
+				"timestamp": 1407160197
+			}
+			"sound": "buzz.mp3",
+			"vibrate": {
+				"pattern": [200, 100],
+				"repeat": 2
+			}
+			"emblem-counter": {
+				"count": 12,
+				"visible": true
+			}
+		}
+	}
+
+The notification can contain a **tag** field, which can later be used by the `persistent notification management API. <#persistent-notification-management>`__
+
+:message: (optional) A JSON object that is passed as-is to the application via PopAll.
+:notification: (optional) Describes the user-facing notifications triggered by this push message.
+
+The notification can contain a **card**. A card describes a specific notification to be given to the user,
+and has the following fields:
+
+:summary: (required) a title. The card will not be presented if this is missing.
+:body: longer text, defaults to empty.
+:actions: If empty (the default), a bubble notification is non-clickable.
+          If you add a URL, then bubble notifications are clickable and launch that URL. One use for this is using a URL like
+          ``appid://com.ubuntu.developer.ralsina.hello/hello/current-user-version`` which will switch to the app or launch
+          it if it's not running. See `URLDispatcher <https://wiki.ubuntu.com/URLDispatcher>`__ for more information.
+
+:icon: An icon relating to the event being notified. Defaults to empty (no icon);
+       a secondary icon relating to the application will be shown as well, regardless of this field.
+:timestamp: Seconds since the unix epoch, only used for persist (for now). If zero or unset, defaults to current timestamp.
+:persist: Whether to show in notification centre; defaults to false
+:popup: Whether to show in a bubble. Users can disable this, and can easily miss them, so don't rely on it exclusively. Defaults to false.
+
+.. note:: Keep in mind that the precise way in which each field is presented to the user depends on factors such as
+          whether it's shown as a bubble or in the notification centre, or even the version of Ubuntu Touch the user
+          has on their device.
+
+The notification can contain a **sound** field. This is either a boolean (play a predetermined sound) or the path to a sound file. The user can disable it, so don't rely on it exclusively.
+Defaults to empty (no sound). The path is relative, and will be looked up in (a) the application's .local/share/<pkgname>, and (b)
+standard xdg dirs.
+
+The notification can contain a **vibrate** field, causing haptic feedback, which can be either a boolean (if true, vibrate a predetermined way) or an object that has the following content:
+
+:pattern: a list of integers describing a vibration pattern (duration of alternating vibration/no vibration times, in milliseconds).
+:repeat: number of times the pattern has to be repeated (defaults to 1, 0 is the same as 1).
+
+The notification can contain a **emblem-counter** field, with the following content:
+
+:count: a number to be displayed over the application's icon in the launcher.
+:visible: set to true to show the counter, or false to hide it.
+
+.. note:: Unlike other notifications, emblem-counter needs to be cleaned by the app itself.
+          Please see `the persistent notification management section. <#persistent-notification-management>`__
+
+.. FIXME crosslink to hello example app on each method
+
+Security
+~~~~~~~~
+
+To use the push API, applications need to request permission in their security profile, using something like this::
+
+	{
+		"policy_groups": [
+			"networking",
+			"push-notification-client"
+		],
+		"policy_version": 1.2
+	}
+
+
+Ubuntu Push Server API
+----------------------
+
+The Ubuntu Push server is located at https://push.ubuntu.com and has a single endpoint: ``/notify``.
+To notify a user, your application has to do a POST with ``Content-type: application/json``.
+
+Here is an example of the POST body using all the fields::
+
+	{
+		"appid": "com.ubuntu.music_music",
+		"expire_on": "2014-10-08T14:48:00.000Z",
+		"token": "LeA4tRQG9hhEkuhngdouoA==",
+		"clear_pending": true,
+		"replace_tag": "tagname",
+		"data": {
+			"message": "foobar",
+			"notification": {
+				"card": {
+					"summary": "yes",
+					"body": "hello",
+					"popup": true,
+					"persist": true,
+					"timestamp": 1407160197
+				}
+				"sound": "buzz.mp3",
+				"tag": "foo",
+				"vibrate": {
+					"pattern": [200, 100],
+					"repeat": 2
+				}
+				"emblem-counter": {
+					"count": 12,
+					"visible": true
+				}
+			}
+		}
+	}
+
+
+:appid: ID of the application that will receive the notification, as described in the client side documentation.
+:expire_on: Expiration date/time for this message, in `ISO8601 Extendend format <http://en.wikipedia.org/wiki/ISO_8601>`__
+:token: The token identifying the user+device to which the message is directed, as described in the client side documentation.
+:clear_pending: Discards all previous pending notifications. Usually in response to getting a "too-many-pending" error.
+:replace_tag: If there's a pending notification with the same tag, delete it before queuing this new one.
+:data: A JSON object.
+
+In this example, data is `what a helper would output <#helper-output-format>`__ but that's not necessarily the case.
+The content of the data field will be passed to the helper application which **has** to produce output in that format.

=== modified file 'docs/lowlevel.txt'
--- docs/lowlevel.txt	2014-07-29 17:14:22 +0000
+++ docs/lowlevel.txt	2014-08-11 21:30:50 +0000
@@ -73,7 +73,7 @@
 Each Ubuntu Touch package has to use a separate object path for security reasons, that's why the object path includes QUOTED_PKGNAME.
 For example, in the case of the music application, the package name is ``com.ubuntu.music`` and QUOTED_PKGNAME is com_2eubuntu_2emusic.
 Everything that is not a letter or digit has to be quoted as _XX where XX are the hex digits of the character. In practice,
-this means replacing "." with "_2e" and "-" with "_2f"
+this means replacing "." with "_2e" and "-" with "_2d"
 
 .. note:: For applications that are not installed as part of click packages, the QUOTED_PKGNAME is "_" and the APP_ID when required is
           _PACKAGENAME.
@@ -296,12 +296,12 @@
 				"summary": "yes",
 				"body": "hello",
 				"popup": true,
-				"persist": true
+				"persist": true,
+				"timestamp": 1407160197
 			}
 			"sound": "buzz.mp3",
 			"vibrate": {
 				"pattern": [200, 100],
-				"duration": 200,
 				"repeat": 2
 			}
 			"emblem-counter": {
@@ -328,7 +328,7 @@
 
 :icon: An icon relating to the event being notified. Defaults to empty (no icon);
        a secondary icon relating to the application will be shown as well, regardless of this field.
-:timestamp: Seconds since the unix epoch, only used for persist (for now)
+:timestamp: Seconds since the unix epoch, only used for persist (for now). If zero or unset, defaults to current timestamp.
 :persist: Whether to show in notification centre; defaults to false
 :popup: Whether to show in a bubble. Users can disable this, and can easily miss them, so don't rely on it exclusively. Defaults to false.
 
@@ -336,14 +336,13 @@
           whether it's shown as a bubble or in the notification centre, or even the version of Ubuntu Touch the user
           has on their device.
 
-The notification can contain a **sound** field. This is the path to a sound file. The user can disable it, so don't rely on it exclusively.
-Defaults to empty (no sound). This is a relative path, and will be looked up in (a) the application's .local/share/<pkgname>, and (b)
+The notification can contain a **sound** field. This is either a boolean (play a predetermined sound) or the path to a sound file. The user can disable it, so don't rely on it exclusively.
+Defaults to empty (no sound). The path is relative, and will be looked up in (a) the application's .local/share/<pkgname>, and (b)
 standard xdg dirs.
 
-The notification can contain a **vibrate** field, causing haptic feedback, that has the following content:
+The notification can contain a **vibrate** field, causing haptic feedback, which can be either a boolean (if true, vibrate a predetermined way) or an object that has the following content:
 
-:pattern: a list of integers describing a vibration pattern.
-:duration: duration in milliseconds. Is equivalent to setting pattern to [duration], and overrides pattern.
+:pattern: a list of integers describing a vibration pattern (duration of alternating vibration/no vibration times, in milliseconds).
 :repeat: number of times the pattern has to be repeated (defaults to 1, 0 is the same as 1).
 
 The notification can contain a **emblem-counter** field, with the following content:
@@ -391,13 +390,13 @@
 					"summary": "yes",
 					"body": "hello",
 					"popup": true,
-					"persist": true
+					"persist": true,
+					"timestamp": 1407160197
 				}
 				"sound": "buzz.mp3",
 				"tag": "foo",
 				"vibrate": {
-					"duration": 200,
-					"pattern": (200, 100),
+					"pattern": [200, 100],
 					"repeat": 2
 				}
 				"emblem-counter": {

=== added directory 'identifier'
=== added file 'identifier/identifier.go'
--- identifier/identifier.go	1970-01-01 00:00:00 +0000
+++ identifier/identifier.go	2014-08-11 21:30:50 +0000
@@ -0,0 +1,59 @@
+/*
+ Copyright 2013-2014 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 warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 identifier is the source of an anonymous and stable
+// system id (from /var/lib/dbus/machine-id) used by the Ubuntu
+// push notifications service.
+package identifier
+
+import (
+	"fmt"
+	"io/ioutil"
+)
+
+var machineIdPath = "/var/lib/dbus/machine-id"
+
+// an Id knows how to generate itself, and how to stringify itself.
+type Id interface {
+	String() string
+}
+
+// Identifier is the default Id implementation.
+type Identifier struct {
+	value string
+}
+
+func readMachineId() (string, error) {
+	value, err := ioutil.ReadFile(machineIdPath)
+	if err != nil {
+		return "", err
+	}
+	return string(value)[:len(value)-1], nil
+}
+
+// New creates an Identifier
+func New() (Id, error) {
+	value, err := readMachineId()
+	if err != nil {
+		return &Identifier{value: ""}, fmt.Errorf("Failed to read the machine id: %s", err)
+	}
+	return &Identifier{value: value}, nil
+}
+
+// String returns the system identifier as a string.
+func (id *Identifier) String() string {
+	return id.value
+}

=== added file 'identifier/identifier_test.go'
--- identifier/identifier_test.go	1970-01-01 00:00:00 +0000
+++ identifier/identifier_test.go	2014-08-11 21:30:50 +0000
@@ -0,0 +1,54 @@
+/*
+ Copyright 2013-2014 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 warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 identifier
+
+import (
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+// hook up gocheck
+func Test(t *testing.T) { TestingT(t) }
+
+type IdentifierSuite struct{}
+
+var _ = Suite(&IdentifierSuite{})
+
+// TestNew checks that New does not fail, and returns a
+// 32-byte string.
+func (s *IdentifierSuite) TestNew(c *C) {
+	id, err := New()
+	c.Check(err, IsNil)
+	c.Check(id.String(), HasLen, 32)
+}
+
+// TestNewFail checks that when we can't read the machine-id
+// file the error is propagated
+func (s *IdentifierSuite) TestNewFail(c *C) {
+	// replace the machine-id file path
+	machineIdPath = "/var/lib/dbus/no-such-file"
+	id, err := New()
+	c.Check(err, NotNil)
+	c.Check(err.Error(), Equals, "Failed to read the machine id: open /var/lib/dbus/no-such-file: no such file or directory")
+	c.Check(id.String(), HasLen, 0)
+}
+
+// TestIdentifierInterface checks that Identifier implements Id.
+func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
+	id, _ := New()
+	_ = []Id{id}
+}

=== added directory 'identifier/testing'
=== added file 'identifier/testing/testing.go'
--- identifier/testing/testing.go	1970-01-01 00:00:00 +0000
+++ identifier/testing/testing.go	2014-08-11 21:30:50 +0000
@@ -0,0 +1,58 @@
+/*
+ Copyright 2013-2014 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 warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 testing implements a couple of Ids that are useful
+// for testing things that use identifier.
+package testing
+
+// SettableIdentifier is an Id that lets you set the value of the identifier.
+//
+// By default the identifier's value is "<Settable>", so it's visible
+// if you're misusing it.
+type SettableIdentifier struct {
+	value string
+}
+
+// Settable is the constructor for SettableIdentifier.
+func Settable() *SettableIdentifier {
+	return &SettableIdentifier{"<Settable>"}
+}
+
+// Set is the method you use to set the identifier.
+func (sid *SettableIdentifier) Set(value string) {
+	sid.value = value
+}
+
+// String returns the string you set.
+func (sid *SettableIdentifier) String() string {
+	return sid.value
+}
+
+// FailingIdentifier is an Id that always fails to generate.
+type FailingIdentifier struct{}
+
+// Failing is the constructor for FailingIdentifier.
+func Failing() *FailingIdentifier {
+	return &FailingIdentifier{}
+}
+
+// String returns "<Failing>".
+//
+// The purpose of this is to make it easy to spot if you're using it
+// by accident.
+func (*FailingIdentifier) String() string {
+	return "<Failing>"
+}

=== added file 'identifier/testing/testing_test.go'
--- identifier/testing/testing_test.go	1970-01-01 00:00:00 +0000
+++ identifier/testing/testing_test.go	2014-08-11 21:30:50 +0000
@@ -0,0 +1,57 @@
+/*
+ Copyright 2013-2014 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 warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 testing
+
+import (
+	identifier ".."
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+// hook up gocheck
+func Test(t *testing.T) { TestingT(t) }
+
+type IdentifierSuite struct{}
+
+var _ = Suite(&IdentifierSuite{})
+
+// TestSettableDefaultValueVisible tests that SettableIdentifier's default
+// value is notable.
+func (s *IdentifierSuite) TestSettableDefaultValueVisible(c *C) {
+	id := Settable()
+	c.Check(id.String(), Equals, "<Settable>")
+}
+
+// TestSettableSets tests that SettableIdentifier is settable.
+func (s *IdentifierSuite) TestSettableSets(c *C) {
+	id := Settable()
+	id.Set("hello")
+	c.Check(id.String(), Equals, "hello")
+}
+
+// TestFailingStringNotEmpty tests that FailingIdentifier still has a
+// non-empty string.
+func (s *IdentifierSuite) TestFailingStringNotEmpty(c *C) {
+	id := Failing()
+	c.Check(id.String(), Equals, "<Failing>")
+}
+
+// TestIdentifierInterface tests that FailingIdentifier and
+// SettableIdentifier implement Id.
+func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
+	_ = []identifier.Id{Failing(), Settable()}
+}

=== modified file 'launch_helper/helper_output.go'
--- launch_helper/helper_output.go	2014-07-22 14:08:25 +0000
+++ launch_helper/helper_output.go	2014-08-11 21:30:50 +0000
@@ -18,6 +18,7 @@
 
 import (
 	"encoding/json"
+	"time"
 
 	"launchpad.net/ubuntu-push/click"
 )
@@ -25,13 +26,13 @@
 // a Card is the usual “visual” presentation of a notification, used
 // for bubbles and the notification centre (neé messaging menu)
 type Card struct {
-	Summary   string   `json:"summary"`   // required for the card to be presented
-	Body      string   `json:"body"`      // defaults to empty
-	Actions   []string `json:"actions"`   // if empty (default), bubble is non-clickable. More entries change it to be clickable and (for bubbles) snap-decisions.
-	Icon      string   `json:"icon"`      // an icon relating to the event being notified. Defaults to empty (no icon); a secondary icon relating to the application will be shown as well, irrespectively.
-	Timestamp int      `json:"timestamp"` // seconds since epoch, only used for persist (for now)
-	Persist   bool     `json:"persist"`   // whether to show in notification centre; defaults to false
-	Popup     bool     `json:"popup"`     // whether to show in a bubble. Users can disable this, and can easily miss them, so don't rely on it exclusively. Defaults to false.
+	Summary      string   `json:"summary"`   // required for the card to be presented
+	Body         string   `json:"body"`      // defaults to empty
+	Actions      []string `json:"actions"`   // if empty (default), bubble is non-clickable. More entries change it to be clickable and (for bubbles) snap-decisions.
+	Icon         string   `json:"icon"`      // an icon relating to the event being notified. Defaults to empty (no icon); a secondary icon relating to the application will be shown as well, irrespectively.
+	RawTimestamp int      `json:"timestamp"` // seconds since epoch, only used for persist (for now). Timestamp() returns this if non-zero, current timestamp otherwise.
+	Persist      bool     `json:"persist"`   // whether to show in notification centre; defaults to false
+	Popup        bool     `json:"popup"`     // whether to show in a bubble. Users can disable this, and can easily miss them, so don't rely on it exclusively. Defaults to false.
 }
 
 // an EmblemCounter puts a number on an emblem on an app's icon in the launcher
@@ -43,18 +44,17 @@
 // a Vibration generates a vibration in the form of a Pattern set in
 // duration a pattern of on off states, repeated a number of times
 type Vibration struct {
-	Duration uint32   `json:"duration"` // if Duration is present and not 0, it's like a Pattern of [Duration]; otherwise, Pattern is used.
-	Pattern  []uint32 `json:"pattern"`
-	Repeat   uint32   `json:"repeat"` // defaults to 1. A value of zero is ignored (so it's like 1).
+	Pattern []uint32 `json:"pattern"`
+	Repeat  uint32   `json:"repeat"` // defaults to 1. A value of zero is ignored (so it's like 1).
 }
 
 // a Notification can be any of the above
 type Notification struct {
-	Card          *Card          `json:"card"`           // defaults to nil (no card)
-	Sound         string         `json:"sound"`          // a sound file. Users can disable this, so don't rely on it exclusively. Defaults to empty (no sound).
-	Vibrate       *Vibration     `json:"vibrate"`        // users can disable this, blah blah. Defaults to null (no vibration)
-	EmblemCounter *EmblemCounter `json:"emblem-counter"` // puts a counter on an emblem in the launcher. Defaults to nil (no change to emblem counter).
-	Tag           string         `json:"tag,omitempty"`  // tag used for Clear/ListPersistent.
+	Card          *Card           `json:"card"`           // defaults to nil (no card)
+	RawSound      json.RawMessage `json:"sound"`          // a boolean, or the relative path to a sound file. Users can disable this, so don't rely on it exclusively. Defaults to empty (no sound).
+	RawVibration  json.RawMessage `json:"vibrate"`        // users can disable this, blah blah. Can be Vibration, or boolean. Defaults to null (no vibration)
+	EmblemCounter *EmblemCounter  `json:"emblem-counter"` // puts a counter on an emblem in the launcher. Defaults to nil (no change to emblem counter).
+	Tag           string          `json:"tag,omitempty"`  // tag used for Clear/ListPersistent.
 }
 
 // HelperOutput is the expected output of a helper
@@ -76,3 +76,58 @@
 	NotificationId string
 	Payload        json.RawMessage
 }
+
+// Timestamp() returns RawTimestamp if non-zero. If it's zero, returns
+// the current time as second since epoch.
+func (card *Card) Timestamp() int64 {
+	if card.RawTimestamp == 0 {
+		return time.Now().Unix()
+	} else {
+		return int64(card.RawTimestamp)
+	}
+}
+
+func (notification *Notification) Vibration(fallback *Vibration) *Vibration {
+	var b bool
+	var vib *Vibration
+
+	if notification.RawVibration == nil {
+		return nil
+	}
+	if json.Unmarshal(notification.RawVibration, &b) == nil {
+		if !b {
+			return nil
+		} else {
+			return fallback
+		}
+	}
+	if json.Unmarshal(notification.RawVibration, &vib) != nil {
+		return nil
+	}
+	if len(vib.Pattern) == 0 {
+		return nil
+	}
+
+	return vib
+}
+
+func (notification *Notification) Sound(fallback string) string {
+	var b bool
+	var s string
+
+	if notification.RawSound == nil {
+		return ""
+	}
+	if json.Unmarshal(notification.RawSound, &b) == nil {
+		if !b {
+			return ""
+		} else {
+			return fallback
+		}
+	}
+	if json.Unmarshal(notification.RawSound, &s) != nil {
+		return ""
+	}
+
+	return s
+}

=== added file 'launch_helper/helper_output_test.go'
--- launch_helper/helper_output_test.go	1970-01-01 00:00:00 +0000
+++ launch_helper/helper_output_test.go	2014-08-11 21:30:50 +0000
@@ -0,0 +1,96 @@
+/*
+ Copyright 2014 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 warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, 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 launch_helper
+
+import (
+	"encoding/json"
+	"time"
+
+	. "launchpad.net/gocheck"
+)
+
+type outSuite struct{}
+
+var _ = Suite(&outSuite{})
+
+func (*outSuite) TestCardGetTimestamp(c *C) {
+	t := time.Now().Add(-2 * time.Second)
+	var card Card
+	err := json.Unmarshal([]byte(`{"timestamp": 12}`), &card)
+	c.Assert(err, IsNil)
+	c.Check(card, DeepEquals, Card{RawTimestamp: 12})
+	c.Check(time.Unix((&Card{}).Timestamp(), 0).After(t), Equals, true)
+	c.Check((&Card{RawTimestamp: 42}).Timestamp(), Equals, int64(42))
+}
+
+func (*outSuite) TestBadVibeBegetsNilVibe(c *C) {
+	fbck := &Vibration{Repeat: 2}
+	for _, s := range []string{
+		`{}`,
+		`{"vibrate": "foo"}`,
+		`{"vibrate": {}}`,
+		`{"vibrate": false}`,         // not bad, but rather pointless
+		`{"vibrate": {"repeat": 2}}`, // no pattern
+		`{"vibrate": {"repeat": "foo"}}`,
+		`{"vibrate": {"pattern": "foo"}}`,
+		`{"vibrate": {"pattern": ["foo"]}}`,
+		`{"vibrate": {"pattern": null}}`,
+		`{"vibrate": {"pattern": [-1]}}`,
+		`{"vibrate": {"pattern": [1], "repeat": -1}}`,
+	} {
+		var notif *Notification
+		err := json.Unmarshal([]byte(s), &notif)
+		c.Assert(err, IsNil)
+		c.Assert(notif, NotNil)
+		c.Check(notif.Vibration(fbck), IsNil, Commentf("not nil Vibration() for: %s", s))
+		c.Check(notif.Vibration(fbck), IsNil, Commentf("not nil second call to Vibration() for: %s", s))
+	}
+}
+
+func (*outSuite) TestGoodVibe(c *C) {
+	var notif *Notification
+	err := json.Unmarshal([]byte(`{"vibrate": {"pattern": [1,2,3], "repeat": 2}}`), &notif)
+	c.Assert(err, IsNil)
+	c.Assert(notif, NotNil)
+	c.Check(notif.Vibration(nil), DeepEquals, &Vibration{Pattern: []uint32{1, 2, 3}, Repeat: 2})
+}
+
+func (*outSuite) TestGoodSimpleVibe(c *C) {
+	var notif *Notification
+	fallback := &Vibration{Pattern: []uint32{100, 100}, Repeat: 3}
+	err := json.Unmarshal([]byte(`{"vibrate": true}`), &notif)
+	c.Assert(err, IsNil)
+	c.Assert(notif, NotNil)
+	c.Check(notif.Vibration(fallback), Equals, fallback)
+}
+
+func (*outSuite) TestBadSoundBegetsNoSound(c *C) {
+	c.Check((&Notification{RawSound: json.RawMessage("foo")}).Sound("x"), Equals, "")
+}
+
+func (*outSuite) TestNilSoundBegetsNoSound(c *C) {
+	c.Check((&Notification{RawSound: nil}).Sound("x"), Equals, "")
+}
+
+func (*outSuite) TestGoodSound(c *C) {
+	c.Check((&Notification{RawSound: json.RawMessage(`"foo"`)}).Sound("x"), Equals, "foo")
+}
+
+func (*outSuite) TestGoodSimpleSound(c *C) {
+	c.Check((&Notification{RawSound: json.RawMessage(`true`)}).Sound("x"), Equals, "x")
+	c.Check((&Notification{RawSound: json.RawMessage(`false`)}).Sound("x"), Equals, "")
+}

=== modified file 'launch_helper/helper_test.go'
--- launch_helper/helper_test.go	2014-07-22 14:08:25 +0000
+++ launch_helper/helper_test.go	2014-08-11 21:30:50 +0000
@@ -43,7 +43,7 @@
 }
 
 func (s *runnerSuite) TestTrivialPoolWorks(c *C) {
-	notif := &Notification{Sound: "42", Tag: "foo"}
+	notif := &Notification{RawSound: json.RawMessage(`"42"`), Tag: "foo"}
 
 	triv := NewTrivialHelperPool(s.testlog)
 	ch := triv.Start()

=== modified file 'launch_helper/kindpool_test.go'
--- launch_helper/kindpool_test.go	2014-07-30 09:26:25 +0000
+++ launch_helper/kindpool_test.go	2014-08-11 21:30:50 +0000
@@ -17,6 +17,7 @@
 package launch_helper
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -285,7 +286,7 @@
 
 	res := takeNext(ch, c)
 
-	expected := HelperOutput{Notification: &Notification{Sound: "hello", Tag: "a-tag"}}
+	expected := HelperOutput{Notification: &Notification{RawSound: json.RawMessage(`"hello"`), Tag: "a-tag"}}
 	c.Check(res.HelperOutput, DeepEquals, expected)
 	c.Check(pool.hmap, HasLen, 0)
 }

=== modified file 'messaging/cmessaging/cmessaging.go'
--- messaging/cmessaging/cmessaging.go	2014-07-24 16:25:55 +0000
+++ messaging/cmessaging/cmessaging.go	2014-08-11 21:30:50 +0000
@@ -84,7 +84,7 @@
 	body := gchar(card.Body)
 	defer gfree(body)
 
-	timestamp := (C.gint64)(int64(card.Timestamp) * 1000000)
+	timestamp := (C.gint64)(card.Timestamp() * 1000000)
 
 	C.add_notification(desktop_id, notification_id, icon_path, summary, body, timestamp, nil, (C.gpointer)(payload))
 }

=== added file 'scripts/connect-many.py'
--- scripts/connect-many.py	1970-01-01 00:00:00 +0000
+++ scripts/connect-many.py	2014-08-11 21:30:50 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/python3
+import sys
+import resource
+import socket
+import ssl
+import time
+
+host, port = sys.argv[1].split(":")
+addr = (host, int(port))
+soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+# reset soft == hard
+resource.setrlimit(resource.RLIMIT_NOFILE, (hard, hard))
+
+conns = []
+t0 = time.time()
+try:
+    for i in range(soft+100):
+        s=socket.socket()
+        w = ssl.wrap_socket(s)
+        w.settimeout(1)
+        w.connect(addr)
+        conns.append(w)
+        w.send(b"x")
+except Exception as e:
+    print("%s|%d|%s" % (e, len(conns), time.time()-t0))
+    sys.exit(0)
+
+print("UNTROUBLED|%d" % len(conns))
+sys.exit(1)

=== added file 'scripts/goctest'
--- scripts/goctest	1970-01-01 00:00:00 +0000
+++ scripts/goctest	2014-08-11 21:30:50 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/python3
+# -*- python -*-
+# (c) 2014 John Lenton
+# MIT licensed.
+# from https://github.com/chipaca/goctest
+
+import re
+import signal
+import subprocess
+import sys
+
+ok_rx = re.compile(rb'^(PASS:?|ok\s+)')
+fail_rx = re.compile(rb'^(FAIL:?|OOPS:?)')
+panic_rx = re.compile(rb'^(PANIC:?|panic:?|\.\.\. Panic:?)')
+log_rx = re.compile(rb'^\[LOG\]|^\?\s+')
+
+class bcolors:
+    OK = b'\033[38;5;34m'
+    FAIL = b'\033[38;5;196m'
+    PANIC = b'\033[38;5;226m\033[48;5;88m'
+    OTHER = b'\033[38;5;241m'
+    WARNING = b'\033[38;5;226m'
+    ENDC = b'\033[0m'
+
+signal.signal(signal.SIGINT, lambda *_: None)
+
+if sys.stdout.isatty():
+    with subprocess.Popen(["go", "test"] + sys.argv[1:],
+                          bufsize=0,
+                          stderr=subprocess.STDOUT,
+                          stdout=subprocess.PIPE) as proc:
+        for line in proc.stdout:
+            if panic_rx.search(line) is not None:
+                line = panic_rx.sub(bcolors.PANIC + rb'\1' + bcolors.ENDC, line)
+            elif fail_rx.search(line) is not None:
+                line = fail_rx.sub(bcolors.FAIL + rb'\1' + bcolors.ENDC, line)
+            elif ok_rx.search(line) is not None:
+                line = ok_rx.sub(bcolors.OK + rb'\1' + bcolors.ENDC, line)
+            elif log_rx.search(line) is not None:
+                line = bcolors.OTHER + line + bcolors.ENDC
+
+            sys.stdout.write(line.decode("utf-8"))
+            sys.stdout.flush()
+        sys.exit(proc.wait())
+else:
+    sys.exit(subprocess.call(["go", "test"] + sys.argv[1:]))

=== modified file 'server/listener/listener_test.go'
--- server/listener/listener_test.go	2014-03-06 19:21:44 +0000
+++ server/listener/listener_test.go	2014-08-11 21:30:50 +0000
@@ -20,9 +20,12 @@
 	"crypto/tls"
 	"crypto/x509"
 	"net"
+	"os/exec"
+	"regexp"
 	"syscall"
 	"testing"
 	"time"
+	"unicode"
 
 	. "launchpad.net/gocheck"
 
@@ -37,7 +40,7 @@
 
 var _ = Suite(&listenerSuite{})
 
-const NofileMax = 500
+const NofileMax = 20
 
 func (s *listenerSuite) SetUpSuite(*C) {
 	// make it easier to get a too many open files error
@@ -111,13 +114,19 @@
 
 func testSession(conn net.Conn) error {
 	defer conn.Close()
-	conn.SetDeadline(time.Now().Add(2 * time.Second))
+	conn.SetDeadline(time.Now().Add(10 * time.Second))
 	var buf [1]byte
-	_, err := conn.Read(buf[:])
-	if err != nil {
-		return err
+	for {
+		_, err := conn.Read(buf[:])
+		if err != nil {
+			return err
+		}
+		// 1|2... send digit back
+		if unicode.IsDigit(rune(buf[0])) {
+			break
+		}
 	}
-	_, err = conn.Write(buf[:])
+	_, err := conn.Write(buf[:])
 	return err
 }
 
@@ -165,6 +174,18 @@
 	c.Check(s.testlog.Captured(), Equals, "")
 }
 
+// waitForLogs waits for the logs captured in s.testlog to match reStr.
+func (s *listenerSuite) waitForLogs(c *C, reStr string) {
+	rx := regexp.MustCompile("^" + reStr + "$")
+	for i := 0; i < 100; i++ {
+		if rx.MatchString(s.testlog.Captured()) {
+			break
+		}
+		time.Sleep(20 * time.Millisecond)
+	}
+	c.Check(s.testlog.Captured(), Matches, reStr)
+}
+
 func (s *listenerSuite) TestDeviceAcceptLoopTemporaryError(c *C) {
 	// ENFILE is not the temp network error we want to handle this way
 	// but is relatively easy to generate in a controlled way
@@ -177,20 +198,11 @@
 		errCh <- lst.AcceptLoop(testSession, s.testlog)
 	}()
 	listenerAddr := lst.Addr().String()
-	conns := make([]net.Conn, 0, NofileMax)
-	for i := 0; i < NofileMax; i++ {
-		var conn1 net.Conn
-		conn1, err = net.Dial("tcp", listenerAddr)
-		if err != nil {
-			break
-		}
-		defer conn1.Close()
-		conns = append(conns, conn1)
-	}
-	c.Assert(err, ErrorMatches, "*.too many open.*")
-	for _, conn := range conns {
-		conn.Close()
-	}
+	connectMany := helpers.ScriptAbsPath("connect-many.py")
+	cmd := exec.Command(connectMany, listenerAddr)
+	res, err := cmd.Output()
+	c.Assert(err, IsNil)
+	c.Assert(string(res), Matches, "(?s).*timed out.*")
 	conn2, err := testTlsDial(c, listenerAddr)
 	c.Assert(err, IsNil)
 	defer conn2.Close()
@@ -198,7 +210,7 @@
 	testReadByte(c, conn2, '2')
 	lst.Close()
 	c.Check(<-errCh, ErrorMatches, ".*use of closed.*")
-	c.Check(s.testlog.Captured(), Matches, ".*device listener:.*accept.*too many open.*-- retrying\n")
+	s.waitForLogs(c, "(?ms).*device listener:.*accept.*too many open.*-- retrying")
 }
 
 func (s *listenerSuite) TestDeviceAcceptLoopPanic(c *C) {
@@ -217,7 +229,7 @@
 	c.Assert(err, Not(IsNil))
 	lst.Close()
 	c.Check(<-errCh, ErrorMatches, ".*use of closed.*")
-	c.Check(s.testlog.Captured(), Matches, "(?s)ERROR\\(PANIC\\) terminating device connection on: session crash:.*AcceptLoop.*")
+	s.waitForLogs(c, "(?s)ERROR\\(PANIC\\) terminating device connection on: session crash:.*AcceptLoop.*")
 }
 
 func (s *listenerSuite) TestForeignListener(c *C) {

=== modified file 'sounds/sounds.go'
--- sounds/sounds.go	2014-07-25 10:25:59 +0000
+++ sounds/sounds.go	2014-08-11 21:30:50 +0000
@@ -17,9 +17,11 @@
 package sounds
 
 import (
+	"errors"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 
 	"launchpad.net/go-xdg/v0"
 
@@ -31,12 +33,19 @@
 type Sound struct {
 	player   string
 	log      logger.Logger
+	fallback string
 	dataDirs func() []string
 	dataFind func(string) (string, error)
 }
 
-func New(log logger.Logger) *Sound {
-	return &Sound{player: "paplay", log: log, dataDirs: xdg.Data.Dirs, dataFind: xdg.Data.Find}
+func New(log logger.Logger, fallback string) *Sound {
+	return &Sound{
+		player:   "paplay",
+		log:      log,
+		fallback: fallback,
+		dataDirs: xdg.Data.Dirs,
+		dataFind: xdg.Data.Find,
+	}
 }
 
 func (snd *Sound) Present(app *click.AppId, nid string, notification *launch_helper.Notification) bool {
@@ -44,13 +53,14 @@
 		panic("please check notification is not nil before calling present")
 	}
 
-	if notification.Sound == "" {
-		snd.log.Debugf("[%s] notification has no Sound: %#v", nid, notification.Sound)
+	sound := notification.Sound(snd.fallback)
+	if sound == "" {
+		snd.log.Debugf("[%s] notification has no Sound: %#v", nid, sound)
 		return false
 	}
-	absPath := snd.findSoundFile(app, nid, notification.Sound)
+	absPath := snd.findSoundFile(app, nid, sound)
 	if absPath == "" {
-		snd.log.Debugf("[%s] unable to find sound %s", nid, notification.Sound)
+		snd.log.Debugf("[%s] unable to find sound %s", nid, sound)
 		return false
 	}
 	snd.log.Debugf("[%s] playing sound %s using %s", nid, absPath, snd.player)
@@ -69,9 +79,23 @@
 	return true
 }
 
+// Removes all cruft from path, ensures it's a "forward" path.
+func (snd *Sound) cleanPath(path string) (string, error) {
+	cleaned := filepath.Clean(path)
+	if strings.Contains(cleaned, "../") {
+		return "", errors.New("Path escaping xdg attempt")
+	}
+	return cleaned, nil
+}
+
 func (snd *Sound) findSoundFile(app *click.AppId, nid string, sound string) string {
 	// XXX also support legacy appIds?
 	// first, check package-specific
+	sound, err := snd.cleanPath(sound)
+	if err != nil {
+		// bad boy
+		return ""
+	}
 	absPath, err := snd.dataFind(filepath.Join(app.Package, sound))
 	if err == nil {
 		// ffffound

=== modified file 'sounds/sounds_test.go'
--- sounds/sounds_test.go	2014-07-25 10:25:59 +0000
+++ sounds/sounds_test.go	2014-08-11 21:30:50 +0000
@@ -17,6 +17,7 @@
 package sounds
 
 import (
+	"encoding/json"
 	"errors"
 	"os"
 	"path"
@@ -45,9 +46,10 @@
 }
 
 func (ss *soundsSuite) TestNew(c *C) {
-	s := New(ss.log)
+	s := New(ss.log, "foo")
 	c.Check(s.log, Equals, ss.log)
 	c.Check(s.player, Equals, "paplay")
+	c.Check(s.fallback, Equals, "foo")
 }
 
 func (ss *soundsSuite) TestPresent(c *C) {
@@ -57,10 +59,22 @@
 	}
 
 	c.Check(s.Present(ss.app, "",
-		&launch_helper.Notification{Sound: "hello"}), Equals, true)
+		&launch_helper.Notification{RawSound: json.RawMessage(`"hello"`)}), Equals, true)
 	c.Check(ss.log.Captured(), Matches, `(?sm).* playing sound com.example.test/hello using echo`)
 }
 
+func (ss *soundsSuite) TestPresentSimple(c *C) {
+	s := &Sound{
+		player: "echo", log: ss.log,
+		dataFind: func(s string) (string, error) { return s, nil },
+		fallback: "fallback",
+	}
+
+	c.Check(s.Present(ss.app, "",
+		&launch_helper.Notification{RawSound: json.RawMessage(`true`)}), Equals, true)
+	c.Check(ss.log.Captured(), Matches, `(?sm).* playing sound com.example.test/fallback using echo`)
+}
+
 func (ss *soundsSuite) TestPresentFails(c *C) {
 	s := &Sound{
 		player:   "/",
@@ -74,10 +88,10 @@
 	// no Sound
 	c.Check(s.Present(ss.app, "", &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, "", &launch_helper.Notification{RawSound: json.RawMessage(`"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, "", &launch_helper.Notification{RawSound: json.RawMessage(`"hello"`)}), Equals, false)
 
 	// and now, just to prove it would've worked,
 
@@ -86,5 +100,31 @@
 	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, "", &launch_helper.Notification{RawSound: json.RawMessage(`"hello"`)}), Equals, true)
+}
+
+func (ss *soundsSuite) TestBadPathFails(c *C) {
+	s := &Sound{
+		player:   "/",
+		log:      ss.log,
+		dataFind: func(string) (string, error) { return "", errors.New("nope") },
+		dataDirs: func() []string { return []string{""} },
+	}
+
+	sound, err := s.cleanPath("../../foo")
+	c.Check(err, NotNil)
+	c.Check(sound, Equals, "")
+}
+
+func (ss *soundsSuite) TestGoodPathSucceeds(c *C) {
+	s := &Sound{
+		player:   "/",
+		log:      ss.log,
+		dataFind: func(string) (string, error) { return "", errors.New("nope") },
+		dataDirs: func() []string { return []string{""} },
+	}
+
+	sound, err := s.cleanPath("foo/../bar")
+	c.Check(err, IsNil)
+	c.Check(sound, Equals, "bar")
 }

=== modified file 'tests/autopilot/push_notifications/tests/__init__.py'
--- tests/autopilot/push_notifications/tests/__init__.py	2014-07-09 23:26:45 +0000
+++ tests/autopilot/push_notifications/tests/__init__.py	2014-08-11 21:30:50 +0000
@@ -26,6 +26,7 @@
 import evdev
 
 from autopilot.introspection import dbus
+from autopilot.exceptions import StateNotFoundError
 from push_notifications import config as push_config
 import push_notifications.helpers.push_notifications_helper as push_helper
 from testtools.matchers import Equals
@@ -238,6 +239,22 @@
         """
         self.validate_and_dismiss_notification_dialog(message, secondary_icon=False)
 
+    def validate_and_tap_notification_dialog(self, message,
+                                             secondary_icon=True):
+        """
+        Validate a notification dialog is displayed and dismiss it
+        :param message: expected message displayed in summary
+        """
+        # get the dialog
+        dialog, props = self.get_notification_dialog()
+        # validate dialog
+        self.assert_notification_dialog(
+            props, summary=message, secondary_icon=secondary_icon)
+        # tap the dialog
+        self.touch.tap_object(dialog)
+        # check the dialog is no longer displayed
+        self.validate_notification_not_displayed(wait=False)
+
     def wait_until_dialog_dismissed(self, dialog):
         """Wait for the dialog to dismiss automatically"""
         dialog_disappeared = False
@@ -270,7 +287,7 @@
             self.wait_until_dialog_dismissed(dialog)
 
     # unicast messages
-    def send_unicast_notification(self, icon="messages-app",
+    def send_unicast_notification(self, icon="",
                                   body="A unicast message", summary="Look!",
                                   persist=False, popup=True, actions=[], emblem_counter={}):
         """Build and send a push unicast message.
@@ -309,3 +326,36 @@
         indicator_page = self.main_window.open_indicator_page(
             "indicator-messages")
         return indicator_page
+
+    def validate_mmu_notification(self, body_text, title_text):
+        # get the mmu notification and check the body and title.
+        # swipe down and show the incomming page
+        messaging = self.get_messaging_menu()
+        # get the notification and check the body and title.
+        menuItem0 = messaging.select_single('QQuickLoader',
+                                            objectName='menuItem0')
+        hmh = menuItem0.select_single('HeroMessageHeader')
+        body = hmh.select_single("Label", objectName='body')
+        self.assertEqual(body.text, body_text)
+        title = hmh.select_single("Label", objectName='title')
+        self.assertEqual(title.text, title_text)
+        self.clear_mmu(ignore_missing=False)
+
+    def clear_mmu(self, ignore_missing=True):
+        # get the mmu notification and check the body and title.
+        messaging = self.get_messaging_menu()
+        # clear all notifications
+        try:
+            clear_all = messaging.select_single(
+                'ButtonMenu', objectName='indicator.remove-all')
+        except StateNotFoundError:
+            if not ignore_missing:
+                raise
+            return
+        emptyLabel = messaging.select_single('Label',
+                                             objectName='emptyLabel')
+        self.assertFalse(emptyLabel.visible)
+        self.touch.tap_object(clear_all)
+        emptyLabel = messaging.select_single('Label',
+                                             objectName='emptyLabel')
+        self.assertTrue(emptyLabel.visible)

=== modified file 'tests/autopilot/push_notifications/tests/test_broadcast_notifications.py'
--- tests/autopilot/push_notifications/tests/test_broadcast_notifications.py	2014-07-09 18:37:25 +0000
+++ tests/autopilot/push_notifications/tests/test_broadcast_notifications.py	2014-08-11 21:30:50 +0000
@@ -21,15 +21,19 @@
 
 import time
 
+from autopilot import platform
+from testtools import skipIf
+
 from push_notifications.tests import PushNotificationTestBase
 
 
+DEFAULT_DISPLAY_MESSAGE = "There's an updated system image."
+MMU_BODY = "Tap to open the system updater."
+MMU_TITLE = DEFAULT_DISPLAY_MESSAGE
+
+
 class TestPushClientBroadcast(PushNotificationTestBase):
-    """
-    Test cases for broadcast push notifications
-    """
-
-    DEFAULT_DISPLAY_MESSAGE = 'There\'s an updated system image.'
+    """Test cases for broadcast push notifications"""
 
     def test_broadcast_push_notification_screen_off(self):
         """
@@ -45,8 +49,12 @@
         time.sleep(2)
         # Turn display on
         self.press_power_button()
-        self.validate_and_dismiss_broadcast_notification_dialog(
-            self.DEFAULT_DISPLAY_MESSAGE)
+        # Assumes greeter starts in locked state
+        self.unlock_greeter()
+        # check the bubble is there
+        self.validate_and_dismiss_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
+        # clear the mmu
+        self.clear_mmu()
 
     def test_broadcast_push_notification_locked_greeter(self):
         """
@@ -54,10 +62,13 @@
         to the client and validate that a notification message is displayed
         whist the greeter screen is displayed
         """
+        self.send_push_broadcast_message()
+        # check the bubble is there
+        self.validate_and_dismiss_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
         # Assumes greeter starts in locked state
-        self.send_push_broadcast_message()
-        self.validate_and_dismiss_broadcast_notification_dialog(
-            self.DEFAULT_DISPLAY_MESSAGE)
+        self.unlock_greeter()
+        # clear the mmu
+        self.clear_mmu()
 
     def test_broadcast_push_notification(self):
         """
@@ -67,8 +78,42 @@
         # Assumes greeter starts in locked state
         self.unlock_greeter()
         self.send_push_broadcast_message()
-        self.validate_and_dismiss_broadcast_notification_dialog(
-            self.DEFAULT_DISPLAY_MESSAGE)
+        # check the bubble is there
+        self.validate_and_dismiss_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
+        # clear the mmu
+        self.clear_mmu()
+
+    @skipIf(platform.model() == 'X86 Emulator',
+            "Test not working in the emulator")
+    def test_broadcast_push_notification_is_persistent(self):
+        """
+        Positive test case to send a valid broadcast push notification
+        to the client and validate that a notification message is displayed
+        and includes a persitent mmu notification.
+        """
+        # Assumes greeter starts in locked state
+        self.unlock_greeter()
+        self.send_push_broadcast_message()
+        # check the bubble is there
+        self.validate_and_dismiss_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
+        # check the mmu notification is there
+        self.validate_mmu_notification(MMU_BODY, MMU_TITLE)
+
+    def test_broadcast_push_notification_click_bubble_clears_mmu(self):
+        """
+        Positive test case to send a valid broadcast push notification
+        to the client and validate that a notification message is displayed
+        """
+        # Assumes greeter starts in locked state
+        self.unlock_greeter()
+        self.send_push_broadcast_message()
+        # check the bubble is there
+        self.validate_and_tap_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
+        # swipe down and show the incomming page
+        messaging = self.get_messaging_menu()
+        emptyLabel = messaging.select_single('Label',
+                                             objectName='emptyLabel')
+        self.assertTrue(emptyLabel.visible)
 
     def test_broadcast_push_notification_on_connect(self):
         """
@@ -81,8 +126,10 @@
         self.push_client_controller.stop_push_client()
         self.send_push_broadcast_message()
         self.push_client_controller.start_push_client()
-        self.validate_and_dismiss_broadcast_notification_dialog(
-            self.DEFAULT_DISPLAY_MESSAGE)
+        # check the bubble is there
+        self.validate_and_dismiss_notification_dialog(DEFAULT_DISPLAY_MESSAGE)
+        # clear the mmu
+        self.clear_mmu()
 
     def test_expired_broadcast_push_notification(self):
         """

=== modified file 'tests/autopilot/push_notifications/tests/test_unicast_notifications.py'
--- tests/autopilot/push_notifications/tests/test_unicast_notifications.py	2014-07-10 01:21:45 +0000
+++ tests/autopilot/push_notifications/tests/test_unicast_notifications.py	2014-08-11 21:30:50 +0000
@@ -21,6 +21,9 @@
 
 import os
 
+from autopilot import platform
+from testtools import skipIf
+
 from push_notifications.tests import PushNotificationTestBase
 
 
@@ -30,21 +33,24 @@
     DEFAULT_DISPLAY_MESSAGE = 'Look!'
 
     scenarios = [('click_app_with_version',
-                  dict(app_name="com.ubuntu.calculator_calculator",
+                  dict(app_name="com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter",
                        appid=None, path=None,
                        desktop_dir="~/.local/share/applications/",
-                       launcher_idx=4)),
+                       icon="twitter",
+                       launcher_idx=5)),
                  ('click_app',
-                  dict(app_name="com.ubuntu.calculator_calculator",
-                       appid="com.ubuntu.calculator_calculator",
-                       path="com_2eubuntu_2ecalculator",
+                  dict(app_name="com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter",
+                       appid="com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter",
+                       path="com_2eubuntu_2edeveloper_2ewebapps_2ewebapp_2dtwitter",
                        desktop_dir="~/.local/share/applications/",
-                       launcher_idx=4)),
+                       icon="twitter",
+                       launcher_idx=5)),
                  ('legacy_app',
                   dict(app_name="messaging-app",
                        appid="_messaging-app",
                        path="_",
                        desktop_dir="/usr/share/applications/",
+                       icon="messages-app",
                        launcher_idx=1))]
 
     def setUp(self):
@@ -63,10 +69,13 @@
                     fname.endswith(".desktop"):
                 # remove .desktop extension, only need the name.
                 appid = os.path.splitext(fname)[0]
-                path = appid.split("_")[0].replace(".", "_2e")
+                path = appid.split("_")[0]
+                path = path.replace(".", "_2e").replace("-", "_2d")
                 return appid, path
         return self.appid, self.path
 
+    @skipIf(platform.model() == 'X86 Emulator',
+            "Test not working in the emulator")
     def test_unicast_push_notification_persistent(self):
         """Send a persistent unicast push notification.
 
@@ -76,17 +85,9 @@
         # Assumes greeter starts in locked state
         self.unlock_greeter()
         # send message
-        self.send_unicast_notification(persist=True)
-        # swipe down and show the incomming page
-        messaging = self.get_messaging_menu()
-        # get the notification and check the body and title.
-        menuItem0 = messaging.select_single('QQuickLoader',
-                                            objectName='menuItem0')
-        hmh = menuItem0.select_single('HeroMessageHeader')
-        body = hmh.select_single("Label", objectName='body')
-        self.assertEqual(body.text, 'A unicast message')
-        title = hmh.select_single("Label", objectName='title')
-        self.assertEqual(title.text, 'Look!')
+        self.send_unicast_notification(persist=True, popup=False,
+                                       icon=self.icon)
+        self.validate_mmu_notification("A unicast message", "Look!")
 
     def get_running_app_launcher_icon(self):
         launcher = self.main_window.get_launcher()
@@ -118,6 +119,7 @@
         # send message, only showing emblem counter
         emblem_counter = {'count': 42, 'visible': True}
         self.send_unicast_notification(persist=False, popup=False,
+                                       icon=self.icon,
                                        emblem_counter=emblem_counter)
         # show the dash and check the emblem count.
         self.main_window.show_dash_swiping()
@@ -131,14 +133,15 @@
         The notification should be displayed on top of the greeter.
         """
         # Assumes greeter starts in locked state
-        self.send_unicast_notification(summary="Locked greeter")
+        self.send_unicast_notification(summary="Locked greeter",
+                                       icon=self.icon)
         self.validate_and_dismiss_notification_dialog("Locked greeter")
 
     def test_unicast_push_notification(self):
         """Send a push notificationn and validate it's displayed."""
         # Assumes greeter starts in locked state
         self.unlock_greeter()
-        self.send_unicast_notification()
+        self.send_unicast_notification(icon=self.icon)
         self.validate_and_dismiss_notification_dialog(
             self.DEFAULT_DISPLAY_MESSAGE)
 
@@ -151,7 +154,7 @@
         # Assumes greeter starts in locked state
         self.unlock_greeter()
         self.push_client_controller.stop_push_client()
-        self.send_unicast_notification()
+        self.send_unicast_notification(icon=self.icon)
         self.push_client_controller.start_push_client()
         self.validate_and_dismiss_notification_dialog(
             self.DEFAULT_DISPLAY_MESSAGE)

=== modified file 'tests/autopilot/run.sh'
--- tests/autopilot/run.sh	2014-07-10 13:25:57 +0000
+++ tests/autopilot/run.sh	2014-08-11 21:30:50 +0000
@@ -8,15 +8,17 @@
 usage: $0 options
 
 OPTIONS:
+   -t      fqn of the tests to run (module, class or method)
    -d      adb device_id 
    -v      run tests in verbose mode
 EOF
 }
 
-while getopts "d:v" opt; do
+while getopts "t:d:v" opt; do
     case $opt in
         d) DEVICE_ID=$OPTARG;;
         v) VERBOSITY="-v";;
+        t) TESTS=$OPTARG;;
         *) usage
             exit 1
             ;;
@@ -24,7 +26,9 @@
 done
 
 
+VERBOSITY=${VERBOSITY:-""}
+TESTS=${TESTS:-"push_notifications"}
 DEVICE_ID=${DEVICE_ID:-"emulator-5554"}
 BASE_DIR="ubuntu-push/src/launchpad.net"
 BRANCH_DIR="$BASE_DIR/ubuntu-push"
-adb -s ${DEVICE_ID} shell "su - phablet bash -c 'cd ${BRANCH_DIR}/tests/autopilot/; /sbin/initctl stop unity8; autopilot3 run ${VERBOSITY} push_notifications'"
+adb -s ${DEVICE_ID} shell "su - phablet bash -c 'cd ${BRANCH_DIR}/tests/autopilot/; /sbin/initctl stop unity8; autopilot3 run ${VERBOSITY} ${TESTS}'"

=== modified file 'tests/autopilot/setup.sh'
--- tests/autopilot/setup.sh	2014-07-10 20:54:12 +0000
+++ tests/autopilot/setup.sh	2014-08-11 21:30:50 +0000
@@ -15,11 +15,11 @@
 EOF
 }
 
-while getopts "H:b:c:u" opt; do
+while getopts "H:b:d:u" opt; do
     case $opt in
         H) PUSH_SERVER=$OPTARG;;
         b) BRANCH_URL=$OPTARG;;
-        c) DEVICE_ID=$OPTARG;; 
+        d) DEVICE_ID=$OPTARG;; 
         u) APT_UPDATE="1";;
         *) usage
             exit 1
@@ -54,18 +54,28 @@
     adb -s ${DEVICE_ID} shell "touch autopilot-deps.ok"
 fi
 # fetch the code
-BASE_DIR="ubuntu-push/src/launchpad.net"
+BASE_DIR="/home/phablet/ubuntu-push/src/launchpad.net"
 BRANCH_DIR="$BASE_DIR/ubuntu-push"
 BRANCH_OK=$(adb -s ${DEVICE_ID} shell "su - phablet bash -c '[ ! -d "${BRANCH_DIR}/tests/autopilot" ] && echo 1 || echo 0'")
-if [[ "${BRANCH_OK:0:1}" == 1 ]] 
+if [[ "${BRANCH_OK:0:1}" == 1 ]] || [[ "${BRANCH_URL}" != "lp:ubuntu-push/automatic" ]]
 then
+    adb -s ${DEVICE_ID} shell "su - phablet bash -c 'rm -Rf ${BRANCH_DIR}'"
     echo "fetching code."
     adb -s ${DEVICE_ID} shell "su - phablet bash -c 'mkdir -p ${BASE_DIR}'"
     adb -s ${DEVICE_ID} shell "su - phablet bash -c 'bzr branch ${BRANCH_URL} ${BRANCH_DIR}'"
 fi
-adb -s ${DEVICE_ID} shell "su - phablet bash -c 'sed -i 's/192.168.1.3/${PUSH_SERVER}/' ${BRANCH_DIR}/tests/autopilot/push_notifications/config/push.conf'"
+adb -s ${DEVICE_ID} shell "su - phablet bash -c \"sed -i 's/addr =.*/addr = ${PUSH_SERVER}/' ${BRANCH_DIR}/tests/autopilot/push_notifications/config/push.conf\""
+
+# copy the trivial-helper.sh as the heper for the messaging-app (used in the tests)
+HELPER_OK=$(adb -s ${DEVICE_ID} shell "[ ! -f /usr/lib/ubuntu-push-client/legacy-helpers/messaging-app ] && echo 1 || echo 0")
+if [[ "${HELPER_OK:0:1}" == 1 ]] 
+then
+    adb -s ${DEVICE_ID} shell "cp ${BRANCH_DIR}/scripts/trivial-helper.sh /usr/lib/ubuntu-push-client/legacy-helpers/messaging-app"
+fi
 
 # change the local/dev server config, listen in all interfaces
 sed -i 's/127.0.0.1/0.0.0.0/g' ${ROOT_DIR}/sampleconfigs/dev.json
 # and start it
 cd ${ROOT_DIR}; make run-server-dev 
+# remove the trivial helper for the messaging-app
+adb -s ${DEVICE_ID} shell "rm /usr/lib/ubuntu-push-client/legacy-helpers/messaging-app"

=== removed directory 'whoopsie'
=== removed file 'whoopsie/doc.go'
--- whoopsie/doc.go	2014-02-21 16:17:28 +0000
+++ whoopsie/doc.go	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-/*
- Copyright 2013-2014 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 warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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 whoopsie wraps libwhoopsie.
-package whoopsie

=== removed directory 'whoopsie/identifier'
=== removed file 'whoopsie/identifier/identifier.go'
--- whoopsie/identifier/identifier.go	2014-07-03 10:51:36 +0000
+++ whoopsie/identifier/identifier.go	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- Copyright 2013-2014 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 warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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 identifier wraps libwhoopsie, and is thus the
-// source of an anonymous and stable system id used by the Ubuntu
-// error tracker and the Ubuntu push notifications service.
-package identifier
-
-/*
-#cgo pkg-config: libwhoopsie
-#include <glib.h>
-#include <libwhoopsie/identifier.h>
-*/
-import "C"
-import "unsafe"
-import "errors"
-import "time"
-
-// an Id knows how to generate itself, and how to stringify itself.
-type Id interface {
-	Generate() error
-	String() string
-}
-
-// Identifier is the default Id implementation.
-type Identifier struct {
-	value     string
-	generator func(**C.char, **C.GError)
-}
-
-func generator(csp **C.char, errp **C.GError) {
-	C.whoopsie_identifier_generate(csp, errp)
-}
-
-// New creates an Identifier, but does not call Generate() on it.
-func New() Id {
-	return &Identifier{generator: generator}
-}
-
-// Generate makes the Identifier create the identifier itself.
-func (id *Identifier) Generate() error {
-	var gerr *C.GError
-	var cs *C.char
-	defer C.g_free((C.gpointer)(unsafe.Pointer(cs)))
-
-	for i := 0; i < 200; i++ {
-		id.generator(&cs, &gerr)
-
-		if gerr == nil && cs != nil {
-			goto Success
-		}
-		C.g_clear_error(&gerr)
-		time.Sleep(600 * time.Millisecond)
-	}
-	return errors.New("whoopsie_identifier_generate still bad after 2m; giving up")
-
-Success:
-	id.value = C.GoString(cs)
-	return nil
-}
-
-// String returns the system identifier as a string.
-func (id *Identifier) String() string {
-	return id.value
-}

=== removed file 'whoopsie/identifier/identifier_test.go'
--- whoopsie/identifier/identifier_test.go	2014-05-02 10:42:16 +0000
+++ whoopsie/identifier/identifier_test.go	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- Copyright 2013-2014 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 warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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 identifier
-
-import (
-	. "launchpad.net/gocheck"
-	"testing"
-)
-
-// hook up gocheck
-func Test(t *testing.T) { TestingT(t) }
-
-type IdentifierSuite struct{}
-
-var _ = Suite(&IdentifierSuite{})
-
-// TestGenerate checks that Generate() does not fail, and returns a
-// 128-byte string.
-func (s *IdentifierSuite) TestGenerate(c *C) {
-	id := New()
-
-	c.Check(id.Generate(), Equals, nil)
-	c.Check(id.String(), HasLen, 128)
-}
-
-// TestIdentifierInterface checks that Identifier implements Id.
-func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
-	_ = []Id{New()}
-}
-
-// TestFailure checks that Identifier survives whoopsie shenanigans
-func (s *IdentifierSuite) TestIdentifierSurvivesShenanigans(c *C) {
-	count := 0
-	// using _Ctype* as a workaround for gocheck also having a C
-	gen := func(csp **_Ctype_char, errp **_Ctype_GError) {
-		count++
-		if count > 3 {
-			generator(csp, errp)
-		}
-	}
-	id := &Identifier{generator: gen}
-	id.Generate()
-	c.Check(id.String(), HasLen, 128)
-}

=== removed directory 'whoopsie/identifier/testing'
=== removed file 'whoopsie/identifier/testing/testing.go'
--- whoopsie/identifier/testing/testing.go	2014-02-21 16:17:28 +0000
+++ whoopsie/identifier/testing/testing.go	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- Copyright 2013-2014 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 warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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 testing implements a couple of Ids that are useful
-// for testing things that use whoopsie/identifier.
-package testing
-
-import "errors"
-
-// SettableIdentifier is an Id that lets you set the value of the identifier.
-//
-// By default the identifier's value is "<Settable>", so it's visible
-// if you're misusing it.
-type SettableIdentifier struct {
-	value string
-}
-
-// Settable is the constructor for SettableIdentifier.
-func Settable() *SettableIdentifier {
-	return &SettableIdentifier{"<Settable>"}
-}
-
-// Set is the method you use to set the identifier.
-func (sid *SettableIdentifier) Set(value string) {
-	sid.value = value
-}
-
-// Generate does nothing.
-func (sid *SettableIdentifier) Generate() error {
-	return nil
-}
-
-// String returns the string you set.
-func (sid *SettableIdentifier) String() string {
-	return sid.value
-}
-
-// FailingIdentifier is an Id that always fails to generate.
-type FailingIdentifier struct{}
-
-// Failing is the constructor for FailingIdentifier.
-func Failing() *FailingIdentifier {
-	return &FailingIdentifier{}
-}
-
-// Generate fails with an ubiquitous error.
-func (*FailingIdentifier) Generate() error {
-	return errors.New("lp0 on fire")
-}
-
-// String returns "<Failing>".
-//
-// The purpose of this is to make it easy to spot if you're using it
-// by accident.
-func (*FailingIdentifier) String() string {
-	return "<Failing>"
-}

=== removed file 'whoopsie/identifier/testing/testing_test.go'
--- whoopsie/identifier/testing/testing_test.go	2014-02-21 16:17:28 +0000
+++ whoopsie/identifier/testing/testing_test.go	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- Copyright 2013-2014 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 warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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 testing
-
-import (
-	identifier ".."
-	. "launchpad.net/gocheck"
-	"testing"
-)
-
-// hook up gocheck
-func Test(t *testing.T) { TestingT(t) }
-
-type IdentifierSuite struct{}
-
-var _ = Suite(&IdentifierSuite{})
-
-// TestSettableDefaultValueVisible tests that SettableIdentifier's default
-// value is notable.
-func (s *IdentifierSuite) TestSettableDefaultValueVisible(c *C) {
-	id := Settable()
-	c.Check(id.String(), Equals, "<Settable>")
-}
-
-// TestSettableSets tests that SettableIdentifier is settable.
-func (s *IdentifierSuite) TestSettableSets(c *C) {
-	id := Settable()
-	id.Set("hello")
-	c.Check(id.String(), Equals, "hello")
-}
-
-// TestSettableGenerateDoesNotFail tests that SettableIdentifier's Generate
-// does not fail.
-func (s *IdentifierSuite) TestSettableGenerateDoesNotFail(c *C) {
-	id := Settable()
-	c.Check(id.Generate(), Equals, nil)
-}
-
-// TestFailingFails tests that FailingIdentifier fails.
-func (s *IdentifierSuite) TestFailingFails(c *C) {
-	id := Failing()
-	c.Check(id.Generate(), Not(Equals), nil)
-}
-
-// TestFailingStringNotEmpty tests that FailingIdentifier still has a
-// non-empty string.
-func (s *IdentifierSuite) TestFailingStringNotEmpty(c *C) {
-	id := Failing()
-	c.Check(id.String(), Equals, "<Failing>")
-}
-
-// TestIdentifierInterface tests that FailingIdentifier and
-// SettableIdentifier implement Id.
-func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
-	_ = []identifier.Id{Failing(), Settable()}
-}