Merge lp:~jonas-drange/ubuntu-push/lp1517189 into lp:ubuntu-push/automatic

[Jonas G. Drange]

fix tests and warnings

[Samuele Pedroni (pedronis)]

put some comment, quite sure the Makefile change won't help when building in the builders

review: Needs Fixing

[lp:~jonas-drange/ubuntu-push/lp1517189]

422. By Jonas G. Drange on 2015-11-20

undo maxprocs, insecure. add pedronis' fix for panics

[Samuele Pedroni (pedronis)]

so it seeems we need -insecure but is not relevant for building so I would like to talk to some people maintaining go first

looks good to me, but put a small suggestion below

review: Approve

[lp:~jonas-drange/ubuntu-push/lp1517189]

423. By Jonas G. Drange on 2015-11-20

make format

424. By Jonas G. Drange on 2015-11-20

panic on err in helper

=== modified file 'accounts/caccounts.go'
--- accounts/caccounts.go	2014-09-05 10:47:29 +0000
+++ accounts/caccounts.go	2015-11-20 14:56:43 +0000
@@ -3,6 +3,8 @@
 /*
 #include <libaccounts-glib/accounts-glib.h>
 
+void gocb();
+
 static void cb(AgManager *manager, AgAccountId account_id, gpointer p) {
     AgAccount *account = ag_manager_get_account(manager, account_id);
     if (!account) {
 
=== modified file 'click/click_test.go'
--- click/click_test.go	2014-09-17 19:38:34 +0000
+++ click/click_test.go	2015-11-20 14:56:43 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright 2013-2014 Canonical Ltd.
+ Copyright 2013-2015 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
@@ -19,6 +19,8 @@
 import (
 	"encoding/json"
 	"fmt"
+	"os/exec"
+	"strings"
 	"testing"
 
 	. "launchpad.net/gocheck"
@@ -32,6 +34,16 @@
 
 var _ = Suite(&clickSuite{})
 
+func GetPyVer() string {
+	out, err := exec.Command("python3", "-V").Output()
+	if err != nil {
+		panic(err)
+	}
+	pyver := strings.Replace(string(out[:]), "Python ", "", -1)
+	vers := strings.Split(pyver, ".")
+	return fmt.Sprintf("%s.%s", vers[0], vers[1])
+}
+
 func (cs *clickSuite) TestParseAppId(c *C) {
 	app, err := ParseAppId("com.ubuntu.clock_clock")
 	c.Assert(err, IsNil)
@@ -72,18 +84,19 @@
 }
 
 func (cs *clickSuite) TestParseAppIdLegacy(c *C) {
-	app, err := ParseAppId("_python3.4")
+	pyver := fmt.Sprintf("python%s", GetPyVer())
+	app, err := ParseAppId(fmt.Sprintf("_%s", pyver))
 	c.Assert(err, IsNil)
 	c.Check(app.Package, Equals, "")
 	c.Check(app.InPackage(""), Equals, true)
-	c.Check(app.Application, Equals, "python3.4")
+	c.Check(app.Application, Equals, pyver)
 	c.Check(app.Version, Equals, "")
 	c.Check(app.Click, Equals, false)
-	c.Check(app.Original(), Equals, "_python3.4")
-	c.Check(app.Versioned(), Equals, "python3.4")
-	c.Check(app.Base(), Equals, "python3.4")
-	c.Check(app.DesktopId(), Equals, "python3.4.desktop")
-	c.Check(app.DispatchPackage(), Equals, "python3.4")
+	c.Check(app.Original(), Equals, fmt.Sprintf("_%s", pyver))
+	c.Check(app.Versioned(), Equals, pyver)
+	c.Check(app.Base(), Equals, pyver)
+	c.Check(app.DesktopId(), Equals, fmt.Sprintf("%s.desktop", pyver))
+	c.Check(app.DispatchPackage(), Equals, pyver)
 
 	for _, s := range []string{"_.foo", "_foo/", "_/foo"} {
 		app, err = ParseAppId(s)
@@ -93,7 +106,8 @@
 }
 
 func (cs *clickSuite) TestJSON(c *C) {
-	for _, appId := range []string{"com.ubuntu.clock_clock", "com.ubuntu.clock_clock_10", "_python3.4"} {
+	pyver := fmt.Sprintf("python%s", GetPyVer())
+	for _, appId := range []string{"com.ubuntu.clock_clock", "com.ubuntu.clock_clock_10", fmt.Sprintf("_%s", pyver)} {
 		app, err := ParseAppId(appId)
 		c.Assert(err, IsNil, Commentf(appId))
 		b, err := json.Marshal(app)
@@ -106,9 +120,10 @@
 }
 
 func (cs *clickSuite) TestIcon(c *C) {
-	app, err := ParseAppId("_python3.4")
+	pyver := fmt.Sprintf("python%s", GetPyVer())
+	app, err := ParseAppId(fmt.Sprintf("_%s", pyver))
 	c.Assert(err, IsNil)
-	c.Check(app.Icon(), Equals, "/usr/share/pixmaps/python3.4.xpm")
+	c.Check(app.Icon(), Equals, fmt.Sprintf("/usr/share/pixmaps/%s.xpm", pyver))
 }
 
 func (s *clickSuite) TestUser(c *C) {
@@ -161,7 +176,7 @@
 func (s *clickSuite) TestInstalledLegacy(c *C) {
 	u, err := User()
 	c.Assert(err, IsNil)
-	app, err := ParseAppId("_python3.4")
+	app, err := ParseAppId(fmt.Sprintf("_python%s", GetPyVer()))
 	c.Assert(err, IsNil)
 	c.Check(u.Installed(app, false), Equals, true)
 }
@@ -198,7 +213,7 @@
 func (s *clickSuite) TestSymbolicIconCallsSymbolic(c *C) {
 	symbolic = func(string) string { return "xyzzy" }
 	defer func() { symbolic = _symbolic }()
-	app, err := ParseAppId("_python3.4")
+	app, err := ParseAppId(fmt.Sprintf("_python%s", GetPyVer()))
 	c.Assert(err, IsNil)
 	c.Check(app.SymbolicIcon(), Equals, "xyzzy")
 }
 
=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2015-10-29 15:51:59 +0000
+++ client/service/postal_test.go	2015-11-20 14:56:43 +0000
@@ -134,6 +134,7 @@
 }
 
 type fakeUrlDispatcher struct {
+	DispatchDone       chan bool
 	DispatchCalls      [][]string
 	TestURLCalls       []map[string][]string
 	NextTestURLResult  bool
@@ -148,6 +149,7 @@
 	if fud.DispatchShouldFail {
 		return errors.New("fail!")
 	}
+	fud.DispatchDone <- true
 	return nil
 }
 
@@ -196,7 +198,13 @@
 	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))
-	ps.accountsBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), map[string]dbus.Variant{"IncomingMessageVibrate": dbus.Variant{true}})
+	ps.accountsBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), map[string]dbus.Variant{
+		"IncomingMessageVibrate":           dbus.Variant{true},
+		"SilentMode":                       dbus.Variant{false},
+		"IncomingMessageSound":             dbus.Variant{""},
+		"IncomingMessageVibrateSilentMode": dbus.Variant{false},
+	})
+
 	ps.hapticBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.unityGreeterBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), false)
 	ps.winStackBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []windowstack.WindowsInfo{})
@@ -557,14 +565,13 @@
 	svc.NotificationsEndp = endp
 	svc.UnityGreeterEndp = ps.unityGreeterBus
 	svc.WindowStackEndp = ps.winStackBus
+	nopTicker := make(chan []interface{})
+	testibus.SetWatchSource(endp, "ActionInvoked", nopTicker)
+	defer close(nopTicker)
 	svc.launchers = map[string]launch_helper.HelperLauncher{}
 	svc.fallbackVibration = &launch_helper.Vibration{Pattern: []uint32{1}}
 	c.Assert(svc.Start(), IsNil)
 
-	nopTicker := make(chan []interface{})
-	testibus.SetWatchSource(endp, "ActionInvoked", nopTicker)
-	defer close(nopTicker)
-
 	// 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 := json.RawMessage(`true`)
@@ -660,20 +667,19 @@
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	c.Assert(svc.Start(), IsNil)
 	fakeDisp := new(fakeUrlDispatcher)
+	fakeDisp.DispatchDone = make(chan bool)
 	svc.urlDispatcher = fakeDisp
 	fakeDisp.NextTestURLResult = true
 	svc.messagingMenu = fmm
 	aCh := make(chan *notifications.RawAction)
 	rCh := make(chan *reply.MMActionReply)
-	bCh := make(chan bool)
 	go func() {
 		aCh <- nil // just in case?
 		aCh <- &notifications.RawAction{App: app, Action: "potato://", Nid: "xyzzy"}
 		close(aCh)
-		bCh <- true
 	}()
 	go svc.handleActions(aCh, rCh)
-	takeNextBool(bCh)
+	takeNextBool(fakeDisp.DispatchDone)
 	fakeDisp.Lock.Lock()
 	defer fakeDisp.Lock.Unlock()
 	c.Assert(len(fakeDisp.DispatchCalls), Equals, 1)
@@ -687,19 +693,18 @@
 	c.Assert(svc.Start(), IsNil)
 	fakeDisp := new(fakeUrlDispatcher)
 	svc.urlDispatcher = fakeDisp
+	fakeDisp.DispatchDone = make(chan bool)
 	fakeDisp.NextTestURLResult = true
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	aCh := make(chan *notifications.RawAction)
 	rCh := make(chan *reply.MMActionReply)
-	bCh := make(chan bool)
 	go func() {
 		rCh <- nil // just in case?
 		rCh <- &reply.MMActionReply{App: app, Action: "potato://", Notification: "foo.bar"}
 		close(rCh)
-		bCh <- true
 	}()
 	go svc.handleActions(aCh, rCh)
-	takeNextBool(bCh)
+	takeNextBool(fakeDisp.DispatchDone)
 	fakeDisp.Lock.Lock()
 	defer fakeDisp.Lock.Unlock()
 	c.Assert(len(fakeDisp.DispatchCalls), Equals, 1)
 
=== modified file 'client/service/service_test.go'
--- client/service/service_test.go	2014-11-25 17:30:03 +0000
+++ client/service/service_test.go	2015-11-20 14:56:43 +0000
@@ -36,7 +36,9 @@
 	"launchpad.net/ubuntu-push/testing/condition"
 )
 
-func TestService(t *testing.T) { TestingT(t) }
+func TestService(t *testing.T) {
+	TestingT(t)
+}
 
 type serviceSuite struct {
 	log logger.Logger
 
=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2015-04-17 12:55:00 +0000
+++ client/session/session_test.go	2015-11-20 14:56:43 +0000
@@ -1021,8 +1021,20 @@
 	}()
 }
 
+func (s *loopSuite) waitUntilRunning(c *C) {
+	delay := time.Duration(1000)
+	for i := 0; i < 5; i++ {
+		if s.sess.State() == Running {
+			return
+		}
+		time.Sleep(delay)
+		delay *= 2
+	}
+	c.Check(s.sess.State(), Equals, Running)
+}
+
 func (s *loopSuite) TestLoopReadError(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	s.upCh <- errors.New("Read")
 	err := <-s.sess.errCh
 	c.Check(err, ErrorMatches, "Read")
@@ -1030,7 +1042,7 @@
 }
 
 func (s *loopSuite) TestLoopPing(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	c.Check(takeNext(s.downCh), Equals, "deadline 1ms")
 	s.upCh <- protocol.PingPongMsg{Type: "ping"}
 	c.Check(takeNext(s.downCh), Equals, protocol.PingPongMsg{Type: "pong"})
@@ -1040,7 +1052,7 @@
 }
 
 func (s *loopSuite) TestLoopLoopsDaLoop(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	for i := 1; i < 10; i++ {
 		c.Check(takeNext(s.downCh), Equals, "deadline 1ms")
 		s.upCh <- protocol.PingPongMsg{Type: "ping"}
@@ -1053,7 +1065,7 @@
 }
 
 func (s *loopSuite) TestLoopBroadcast(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	b := &protocol.BroadcastMsg{
 		Type:     "broadcast",
 		AppId:    "--ignored--",
@@ -1070,7 +1082,7 @@
 }
 
 func (s *loopSuite) TestLoopNotifications(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 
 	n1 := protocol.Notification{
 		AppId:   "app1",
@@ -1090,7 +1102,7 @@
 }
 
 func (s *loopSuite) TestLoopSetParams(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	setParams := protocol.SetParamsMsg{
 		Type:      "setparams",
 		SetCookie: "COOKIE",
@@ -1104,7 +1116,7 @@
 }
 
 func (s *loopSuite) TestLoopConnBroken(c *C) {
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	broken := protocol.ConnBrokenMsg{
 		Type:   "connbroken",
 		Reason: "REASON",
@@ -1126,7 +1138,7 @@
 	failure := errors.New("warn")
 	log := s.sess.Log.(*helpers.TestLogger)
 
-	c.Check(s.sess.State(), Equals, Running)
+	s.waitUntilRunning(c)
 	c.Check(takeNext(s.downCh), Equals, "deadline 1ms")
 	log.ResetCapture()
 	s.upCh <- warn
 
=== modified file 'config/config_test.go'
--- config/config_test.go	2014-05-16 15:37:24 +0000
+++ config/config_test.go	2015-11-20 14:56:43 +0000
@@ -344,7 +344,7 @@
 		"d": json.RawMessage(`"2s"`),
 	}
 	readUsingFlags(p, reflect.ValueOf(&cfg))
-	c.Check(buf.String(), Matches, `(?s).*-cfg@=<config.json>: get config values from file\n.*-d="2s": duration.*`)
+	c.Check(buf.String(), Matches, `(?s).*get config values from file.*duration.*`)
 }
 
 func (s *configFlagsSuite) TestReadUsingFlagsAlreadyParsed(c *C) {
 
=== modified file 'debian/rules'
--- debian/rules	2015-08-14 13:03:23 +0000
+++ debian/rules	2015-11-20 14:56:43 +0000
@@ -8,12 +8,6 @@
 	dh_auto_build --buildsystem=golang
 	(cd signing-helper && cmake . && make)
 
-# overriding dh_auto_test because the http13client tests don't all pass on go < 1.3
-# (should go away once we ship go 1.3)
-override_dh_auto_test:
-	cd $$( find ./ -type d -regex '\./[^/]*/src/launchpad.net' -printf "%h\n" | head -n1) && \
-	env GOPATH=$$(cd ..; pwd) go test -v $$(env GOPATH=$$(cd ..; pwd) go list $(DH_GOPKG)/... | grep -v acceptance | grep -v http13client )
-
 override_dh_install:
 	dh_install -Xusr/bin/cmd --fail-missing
 
 
=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-03-19 14:35:51 +0000
+++ dependencies.tsv	2015-11-20 14:56:43 +0000
@@ -1,5 +1,5 @@
-code.google.com/p/go-uuid	hg	7dda39b2e7d5e265014674c5af696ba4186679e9	11
+code.google.com/p/go-uuid	hg	35bc42037350f0078e3c974c6ea690f1926603ab	14
 code.google.com/p/gosqlite	hg	74691fb6f83716190870cde1b658538dd4b18eb0	15
-launchpad.net/go-dbus/v1	bzr	[e-mail]-20141023032446-s5icvsucwlv5o38a	129
+launchpad.net/go-dbus/v1	bzr	[e-mail]-20150203130125-kqqbam1jsp3tmlk5	136
 launchpad.net/go-xdg/v0	bzr	[e-mail]-20140208094800-gubd5md7cro3mtxa	10
 launchpad.net/gocheck	bzr	[e-mail]-20140225173054-xu9zlkf9kxhvow02	87
 
=== modified file 'http13client/z_last_test.go'
--- http13client/z_last_test.go	2014-03-19 20:20:19 +0000
+++ http13client/z_last_test.go	2015-11-20 14:56:43 +0000
@@ -5,7 +5,7 @@
 package http_test
 
 import (
-	"launchpad.net/ubuntu-push/http13client"
+	"net/http"
 	"runtime"
 	"sort"
 	"strings"
@@ -26,6 +26,7 @@
 			strings.Contains(stack, "created by net.startServer") ||
 			strings.Contains(stack, "created by testing.RunTests") ||
 			strings.Contains(stack, "closeWriteAndWait") ||
+			strings.Contains(stack, "main.main(") ||
 			strings.Contains(stack, "testing.Main(") ||
 			// These only show up with GOTRACEBACK=2; Issue 5005 (comment 28)
 			strings.Contains(stack, "runtime.goexit") ||
 
=== modified file 'identifier/testing/testing_test.go'
--- identifier/testing/testing_test.go	2014-08-04 20:40:50 +0000
+++ identifier/testing/testing_test.go	2015-11-20 14:56:43 +0000
@@ -17,9 +17,10 @@
 package testing
 
 import (
-	identifier ".."
+	"testing"
+
 	. "launchpad.net/gocheck"
-	"testing"
+	"launchpad.net/ubuntu-push/identifier"
 )
 
 // hook up gocheck
 
=== modified file 'launch_helper/cual/cual_c.go'
--- launch_helper/cual/cual_c.go	2014-07-17 15:46:19 +0000
+++ launch_helper/cual/cual_c.go	2015-11-20 14:56:43 +0000
@@ -24,6 +24,8 @@
 
 #define HELPER_ERROR g_quark_from_static_string ("cgo-ual-helper-error-quark")
 
+void helperDone(gpointer gp, const gchar * ciid);
+
 static void observer_of_stop (const gchar * app_id, const gchar * instance_id, const gchar * helper_type, gpointer user_data) {
     helperDone (user_data, instance_id);
 }
 
=== modified file 'launch_helper/kindpool.go'
--- launch_helper/kindpool.go	2015-08-21 19:53:23 +0000
+++ launch_helper/kindpool.go	2015-11-20 14:56:43 +0000
@@ -26,7 +26,7 @@
 	"sync"
 	"time"
 
-	"launchpad.net/go-xdg/v0"
+	xdg "launchpad.net/go-xdg/v0"
 
 	"launchpad.net/ubuntu-push/click"
 	"launchpad.net/ubuntu-push/launch_helper/cual"
 
=== modified file 'launch_helper/kindpool_test.go'
--- launch_helper/kindpool_test.go	2015-08-21 19:53:23 +0000
+++ launch_helper/kindpool_test.go	2015-11-20 14:56:43 +0000
@@ -24,7 +24,7 @@
 	"path/filepath"
 	"time"
 
-	"launchpad.net/go-xdg/v0"
+	xdg "launchpad.net/go-xdg/v0"
 	. "launchpad.net/gocheck"
 
 	"launchpad.net/ubuntu-push/click"
 
=== modified file 'messaging/cmessaging/cmessaging_c.go'
--- messaging/cmessaging/cmessaging_c.go	2014-07-24 10:33:28 +0000
+++ messaging/cmessaging/cmessaging_c.go	2015-11-20 14:56:43 +0000
@@ -21,6 +21,8 @@
 
 // this is a .go file instead of a .c file because of dh-golang limitations
 
+void handleActivate(gchar* c_action, const gchar * c_notification , gpointer obj);
+
 static void activate_cb(MessagingMenuMessage* msg, gchar* action, GVariant* parameter, gpointer obj) {
     handleActivate(action, messaging_menu_message_get_id(msg), obj);
 }
 
=== modified file 'scripts/connect-many.py'
--- scripts/connect-many.py	2014-08-04 14:47:00 +0000
+++ scripts/connect-many.py	2015-11-20 14:56:43 +0000
@@ -16,7 +16,7 @@
 try:
     for i in range(soft+100):
         s=socket.socket()
-        w = ssl.wrap_socket(s)
+        w = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1)
         w.settimeout(1)
         w.connect(addr)
         conns.append(w)
 
=== modified file 'signing-helper/CMakeLists.txt'
--- signing-helper/CMakeLists.txt	2014-04-30 17:34:57 +0000
+++ signing-helper/CMakeLists.txt	2015-11-20 14:56:43 +0000
@@ -13,8 +13,8 @@
 SET (CMAKE_AUTOMOC ON)
 find_package(Qt5Core REQUIRED)
 
-FILE (GLOB SIGNING_SOURCES signing*.cpp)
-FILE (GLOB SIGNING_HEADERS signing*.h)
+SET (SIGNING_SOURCES signing-helper.cpp)
+SET (SIGNING_HEADERS signing.h)
 
 add_executable (${SIGNING_EXE}
   ${SIGNING_SOURCES}
 
=== modified file 'urldispatcher/curldispatcher/curldispatcher_c.go'
--- urldispatcher/curldispatcher/curldispatcher_c.go	2014-08-29 16:36:30 +0000
+++ urldispatcher/curldispatcher/curldispatcher_c.go	2015-11-20 14:56:43 +0000
@@ -23,6 +23,8 @@
 #include <liburl-dispatcher-1/url-dispatcher.h>
 #include <glib.h>
 
+char* handleDispatchURLResult(const gchar * url, gboolean success, gpointer user_data);
+
 static void url_dispatch_callback(const gchar * url, gboolean success, gpointer user_data) {
     handleDispatchURLResult(url, success, user_data);
 }