Merge lp:~chipaca/ubuntu-push/test-logger-client-bits into lp:ubuntu-push

[John Lenton]

TestLogger

TestLogger.

[John Lenton (chipaca)]

Also in this branch: renamed things from FooTest to TestFoo in bus/*.go, so those tests actually run. Fixed one breaking one.

[lp:~chipaca/ubuntu-push/test-logger-client-bits]

55. By John Lenton on 2014-02-05

Merged client-session-redialer-mash into test-logger-client-bits.

56. By John Lenton on 2014-02-05

fixed buglets in the merge

57. By John Lenton on 2014-02-05

Merged client-session-redialer-mash into test-logger-client-bits.

[Samuele Pedroni (pedronis)]

the style I had in mind was more to have

s.testlog available in the suite

[lp:~chipaca/ubuntu-push/test-logger-client-bits]

58. By John Lenton on 2014-02-05

moved TestLogger creation into SetUpTest

[Samuele Pedroni (pedronis)]

these separators aren't needed, in -gocheck.vv etc gocheck should give separation:

159 + s.log.Debugf("---")

[Samuele Pedroni (pedronis)]

913 func (s *clientSessionSuite) TestJitter(c *C) {
914 - sess, err := NewSession("", nil, 0, "wah", helpers.NewTestLogger(c, "debug"))
915 + sess, err := NewSession("", nil, 0, "wah", s.log)

[lp:~chipaca/ubuntu-push/test-logger-client-bits]

59. By John Lenton on 2014-02-05

nuked the debug separators

60. By John Lenton on 2014-02-05

No longer using both s and cs for clientSessionSuite

[Samuele Pedroni (pedronis)]

+1

review: Approve

=== modified file 'bus/bus_test.go'
--- bus/bus_test.go	2014-01-23 14:33:08 +0000
+++ bus/bus_test.go	2014-02-05 18:24:01 +0000
@@ -18,19 +18,17 @@
 
 import (
 	"fmt"
-	"io/ioutil"
 	"launchpad.net/go-dbus/v1"
 	. "launchpad.net/gocheck"
-	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"testing"
 )
 
 // hook up gocheck
-func BusTest(t *testing.T) { TestingT(t) }
+func TestBus(t *testing.T) { TestingT(t) }
 
 type BusSuite struct{}
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
 var _ = Suite(&BusSuite{})
 
 // Test we stringify sanely
@@ -47,6 +45,6 @@
 
 // Tests that we can get an endpoint back
 func (s *BusSuite) TestEndpoint(c *C) {
-	endp := SystemBus.Endpoint(Address{"", "", ""}, nullog)
+	endp := SystemBus.Endpoint(Address{"", "", ""}, helpers.NewTestLogger(c, "debug"))
 	c.Assert(endp, NotNil)
 }

=== modified file 'bus/connectivity/connectivity_test.go'
--- bus/connectivity/connectivity_test.go	2014-02-04 13:02:38 +0000
+++ bus/connectivity/connectivity_test.go	2014-02-05 18:24:01 +0000
@@ -17,12 +17,12 @@
 package connectivity
 
 import (
-	"io/ioutil"
 	. "launchpad.net/gocheck"
 	"launchpad.net/ubuntu-push/bus/networkmanager"
 	testingbus "launchpad.net/ubuntu-push/bus/testing"
 	"launchpad.net/ubuntu-push/config"
 	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"launchpad.net/ubuntu-push/util"
 	"net/http/httptest"
@@ -35,12 +35,11 @@
 
 type ConnSuite struct {
 	timeouts []time.Duration
+	log      logger.Logger
 }
 
 var _ = Suite(&ConnSuite{})
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
-
 func (s *ConnSuite) SetUpSuite(c *C) {
 	s.timeouts = util.SwapTimeouts([]time.Duration{0, 0, 0, 0})
 }
@@ -50,6 +49,10 @@
 	s.timeouts = nil
 }
 
+func (s *ConnSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
+
 /*
    tests for connectedState's Start() method
 */
@@ -57,7 +60,7 @@
 // when given a working config and bus, Start() will work
 func (s *ConnSuite) TestStartWorks(c *C) {
 	endp := testingbus.NewTestingEndpoint(condition.Work(true), condition.Work(true), uint32(networkmanager.Connecting))
-	cs := connectedState{config: ConnectivityConfig{}, log: nullog, endp: endp}
+	cs := connectedState{config: ConnectivityConfig{}, log: s.log, endp: endp}
 
 	c.Check(cs.start(), Equals, networkmanager.Connecting)
 }
@@ -65,7 +68,7 @@
 // if the bus fails a couple of times, we're still OK
 func (s *ConnSuite) TestStartRetriesConnect(c *C) {
 	endp := testingbus.NewTestingEndpoint(condition.Fail2Work(2), condition.Work(true), uint32(networkmanager.Connecting))
-	cs := connectedState{config: ConnectivityConfig{}, log: nullog, endp: endp}
+	cs := connectedState{config: ConnectivityConfig{}, log: s.log, endp: endp}
 
 	c.Check(cs.start(), Equals, networkmanager.Connecting)
 	c.Check(cs.connAttempts, Equals, uint32(3)) // 1 more than the Fail2Work
@@ -74,7 +77,7 @@
 // when the calls to NetworkManager fail for a bit, we're still OK
 func (s *ConnSuite) TestStartRetriesCall(c *C) {
 	endp := testingbus.NewTestingEndpoint(condition.Work(true), condition.Fail2Work(5), uint32(networkmanager.Connecting))
-	cs := connectedState{config: ConnectivityConfig{}, log: nullog, endp: endp}
+	cs := connectedState{config: ConnectivityConfig{}, log: s.log, endp: endp}
 
 	c.Check(cs.start(), Equals, networkmanager.Connecting)
 
@@ -92,7 +95,7 @@
 	endp := testingbus.NewTestingEndpoint(condition.Work(true), nmcond,
 		uint32(networkmanager.Connecting),
 		uint32(networkmanager.ConnectedGlobal))
-	cs := connectedState{config: ConnectivityConfig{}, log: nullog, endp: endp}
+	cs := connectedState{config: ConnectivityConfig{}, log: s.log, endp: endp}
 
 	c.Check(cs.start(), Equals, networkmanager.Connecting)
 	c.Check(cs.connAttempts, Equals, uint32(2))
@@ -116,7 +119,7 @@
 		config:         cfg,
 		networkStateCh: ch,
 		timer:          time.NewTimer(time.Second),
-		log:            nullog,
+		log:            s.log,
 		webget:         func(ch chan<- bool) { ch <- webget_p.OK() },
 		lastSent:       false,
 	}
@@ -201,7 +204,7 @@
 	out := make(chan bool)
 	dt := time.Second / 10
 	timer := time.NewTimer(dt)
-	go ConnectedState(endp, cfg, nullog, out)
+	go ConnectedState(endp, cfg, s.log, out)
 	var v bool
 	expecteds := []struct {
 		p bool

=== modified file 'bus/connectivity/webchecker_test.go'
--- bus/connectivity/webchecker_test.go	2014-02-04 13:02:38 +0000
+++ bus/connectivity/webchecker_test.go	2014-02-05 18:24:01 +0000
@@ -18,6 +18,8 @@
 
 import (
 	. "launchpad.net/gocheck"
+	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/util"
 	"net/http"
 	"net/http/httptest"
@@ -26,6 +28,7 @@
 
 type WebcheckerSuite struct {
 	timeouts []time.Duration
+	log      logger.Logger
 }
 
 var _ = Suite(&WebcheckerSuite{})
@@ -69,12 +72,16 @@
 	s.timeouts = nil
 }
 
+func (s *WebcheckerSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
+
 // Webchecker sends true when everything works
 func (s *WebcheckerSuite) TestWorks(c *C) {
 	ts := httptest.NewServer(mkHandler(staticText))
 	defer ts.Close()
 
-	ck := NewWebchecker(ts.URL, staticHash, nullog)
+	ck := NewWebchecker(ts.URL, staticHash, s.log)
 	ch := make(chan bool, 1)
 	ck.Webcheck(ch)
 	c.Check(<-ch, Equals, true)
@@ -82,7 +89,7 @@
 
 // Webchecker sends false if the download fails.
 func (s *WebcheckerSuite) TestActualFails(c *C) {
-	ck := NewWebchecker("garbage://", "", nullog)
+	ck := NewWebchecker("garbage://", "", s.log)
 	ch := make(chan bool, 1)
 	ck.Webcheck(ch)
 	c.Check(<-ch, Equals, false)
@@ -93,7 +100,7 @@
 	ts := httptest.NewServer(mkHandler(""))
 	defer ts.Close()
 
-	ck := NewWebchecker(ts.URL, staticHash, nullog)
+	ck := NewWebchecker(ts.URL, staticHash, s.log)
 	ch := make(chan bool, 1)
 	ck.Webcheck(ch)
 	c.Check(<-ch, Equals, false)
@@ -104,7 +111,7 @@
 	ts := httptest.NewServer(mkHandler(bigText))
 	defer ts.Close()
 
-	ck := NewWebchecker(ts.URL, bigHash, nullog)
+	ck := NewWebchecker(ts.URL, bigHash, s.log)
 	ch := make(chan bool, 1)
 	ck.Webcheck(ch)
 	c.Check(<-ch, Equals, false)

=== modified file 'bus/endpoint.go'
--- bus/endpoint.go	2014-02-05 18:24:00 +0000
+++ bus/endpoint.go	2014-02-05 18:24:01 +0000
@@ -125,9 +125,11 @@
 
 // Close the connection to dbus.
 func (endp *endpoint) Close() {
-	endp.bus.Close()
-	endp.bus = nil
-	endp.proxy = nil
+	if endp.bus != nil {
+		endp.bus.Close()
+		endp.bus = nil
+		endp.proxy = nil
+	}
 }
 
 // String() performs advanced endpoint stringification

=== modified file 'bus/endpoint_test.go'
--- bus/endpoint_test.go	2014-01-27 11:46:36 +0000
+++ bus/endpoint_test.go	2014-02-05 18:24:01 +0000
@@ -18,24 +18,28 @@
 
 import (
 	. "launchpad.net/gocheck"
+	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"os"
-	"testing"
 )
 
-// hook up gocheck
-func EndpointTest(t *testing.T) { TestingT(t) }
-
-type EndpointSuite struct{}
+type EndpointSuite struct {
+	log logger.Logger
+}
 
 var _ = Suite(&EndpointSuite{})
 
+func (s *EndpointSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
+
 // TODO: this is going to remain empty until go-dbus grows some
 // testing amenities (already talked about it with jamesh)
 
 // Tests that we can connect to the *actual* system bus.
 // XXX maybe connect to a mock/fake/etc bus?
-func (s *BusSuite) TestDial(c *C) {
-	endp := newEndpoint(SystemBus, Address{"", "", ""}, nullog)
+func (s *EndpointSuite) TestDial(c *C) {
+	endp := newEndpoint(SystemBus, Address{"", "", ""}, s.log)
 	c.Assert(endp.bus, IsNil)
 	err := endp.Dial()
 	c.Assert(err, IsNil)
@@ -47,13 +51,13 @@
 
 // Test that if we try to connect to the session bus when no session
 // bus is available, we get a reasonable result (i.e., an error).
-func (s *BusSuite) TestDialCanFail(c *C) {
+func (s *EndpointSuite) TestDialCanFail(c *C) {
 	db := "DBUS_SESSION_BUS_ADDRESS"
 	odb := os.Getenv(db)
 	defer os.Setenv(db, odb)
 	os.Setenv(db, "")
 
-	endp := newEndpoint(SessionBus, Address{"", "", ""}, nullog)
+	endp := newEndpoint(SessionBus, Address{"", "", ""}, s.log)
 	err := endp.Dial()
 	c.Check(err, NotNil)
 }

=== modified file 'bus/networkmanager/networkmanager_test.go'
--- bus/networkmanager/networkmanager_test.go	2014-01-23 14:33:08 +0000
+++ bus/networkmanager/networkmanager_test.go	2014-02-05 18:24:01 +0000
@@ -17,10 +17,10 @@
 package networkmanager
 
 import (
-	"io/ioutil"
 	. "launchpad.net/gocheck"
 	testingbus "launchpad.net/ubuntu-push/bus/testing"
 	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"testing"
 )
@@ -28,11 +28,15 @@
 // hook up gocheck
 func Test(t *testing.T) { TestingT(t) }
 
-type NMSuite struct{}
+type NMSuite struct {
+	log logger.Logger
+}
 
 var _ = Suite(&NMSuite{})
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
+func (s *NMSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
 
 // TestNames checks that networkmanager.State objects serialize
 // correctly, to a point.
@@ -47,34 +51,34 @@
 
 // TestNew doesn't test much at all. If this fails, all is wrong in the world.
 func (s *NMSuite) TestNew(c *C) {
-	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(true)), nullog)
+	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(true)), s.log)
 	c.Check(nm, NotNil)
 }
 
 // GetState returns the right state when everything works
 func (s *NMSuite) TestGetState(c *C) {
-	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(true), uint32(ConnectedGlobal)), nullog)
+	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(true), uint32(ConnectedGlobal)), s.log)
 	state := nm.GetState()
 	c.Check(state, Equals, ConnectedGlobal)
 }
 
 // GetState returns the right state when dbus fails
 func (s *NMSuite) TestGetStateFail(c *C) {
-	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false), uint32(ConnectedGlobal)), nullog)
+	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false), uint32(ConnectedGlobal)), s.log)
 	state := nm.GetState()
 	c.Check(state, Equals, Unknown)
 }
 
 // GetState returns the right state when dbus works but delivers rubbish values
 func (s *NMSuite) TestGetStateRubbishValues(c *C) {
-	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false), 42), nullog)
+	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false), 42), s.log)
 	state := nm.GetState()
 	c.Check(state, Equals, Unknown)
 }
 
 // GetState returns the right state when dbus works but delivers a rubbish structure
 func (s *NMSuite) TestGetStateRubbishStructure(c *C) {
-	nm := New(testingbus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{}), nullog)
+	nm := New(testingbus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{}), s.log)
 	state := nm.GetState()
 	c.Check(state, Equals, Unknown)
 }
@@ -82,7 +86,7 @@
 // WatchState sends a stream of States over the channel
 func (s *NMSuite) TestWatchState(c *C) {
 	tc := testingbus.NewTestingEndpoint(nil, condition.Work(true), uint32(Unknown), uint32(Asleep), uint32(ConnectedGlobal))
-	nm := New(tc, nullog)
+	nm := New(tc, s.log)
 	ch, err := nm.WatchState()
 	c.Check(err, IsNil)
 	l := []State{<-ch, <-ch, <-ch}
@@ -91,7 +95,7 @@
 
 // WatchState returns on error if the dbus call fails
 func (s *NMSuite) TestWatchStateFails(c *C) {
-	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false)), nullog)
+	nm := New(testingbus.NewTestingEndpoint(nil, condition.Work(false)), s.log)
 	_, err := nm.WatchState()
 	c.Check(err, NotNil)
 }
@@ -99,7 +103,7 @@
 // WatchState calls close on its channel when the watch bails
 func (s *NMSuite) TestWatchClosesOnWatchBail(c *C) {
 	tc := testingbus.NewTestingEndpoint(nil, condition.Work(true))
-	nm := New(tc, nullog)
+	nm := New(tc, s.log)
 	ch, err := nm.WatchState()
 	c.Check(err, IsNil)
 	_, ok := <-ch

=== modified file 'bus/notifications/raw_test.go'
--- bus/notifications/raw_test.go	2014-01-23 14:33:08 +0000
+++ bus/notifications/raw_test.go	2014-02-05 18:24:01 +0000
@@ -20,10 +20,10 @@
 package notifications
 
 import (
-	"io/ioutil"
 	. "launchpad.net/gocheck"
 	testibus "launchpad.net/ubuntu-push/bus/testing"
 	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"testing"
 	"time"
@@ -32,15 +32,19 @@
 // hook up gocheck
 func TestRaw(t *testing.T) { TestingT(t) }
 
-type RawSuite struct{}
+type RawSuite struct {
+	log logger.Logger
+}
+
+func (s *RawSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
 
 var _ = Suite(&RawSuite{})
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
-
 func (s *RawSuite) TestNotifies(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
-	raw := Raw(endp, nullog)
+	raw := Raw(endp, s.log)
 	nid, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, IsNil)
 	c.Check(nid, Equals, uint32(1))
@@ -48,14 +52,14 @@
 
 func (s *RawSuite) TestNotifiesFails(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
-	raw := Raw(endp, nullog)
+	raw := Raw(endp, s.log)
 	_, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, NotNil)
 }
 
 func (s *RawSuite) TestNotifiesFailsWeirdly(c *C) {
 	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{1, 2})
-	raw := Raw(endp, nullog)
+	raw := Raw(endp, s.log)
 	_, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, NotNil)
 }
@@ -63,7 +67,7 @@
 func (s *RawSuite) TestWatchActions(c *C) {
 	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true),
 		[]interface{}{uint32(1), "hello"})
-	raw := Raw(endp, nullog)
+	raw := Raw(endp, s.log)
 	ch, err := raw.WatchActions()
 	c.Assert(err, IsNil)
 	// check we get the right action reply
@@ -81,7 +85,7 @@
 
 func (s *RawSuite) TestWatchActionsFails(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
-	raw := Raw(endp, nullog)
+	raw := Raw(endp, s.log)
 	_, err := raw.WatchActions()
 	c.Check(err, NotNil)
 }

=== modified file 'bus/urldispatcher/urldispatcher_test.go'
--- bus/urldispatcher/urldispatcher_test.go	2014-01-23 14:33:08 +0000
+++ bus/urldispatcher/urldispatcher_test.go	2014-02-05 18:24:01 +0000
@@ -17,10 +17,10 @@
 package urldispatcher
 
 import (
-	"io/ioutil"
 	. "launchpad.net/gocheck"
 	testibus "launchpad.net/ubuntu-push/bus/testing"
 	"launchpad.net/ubuntu-push/logger"
+	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"testing"
 )
@@ -28,22 +28,26 @@
 // hook up gocheck
 func TestUrldispatcher(t *testing.T) { TestingT(t) }
 
-type UDSuite struct{}
+type UDSuite struct {
+	log logger.Logger
+}
 
 var _ = Suite(&UDSuite{})
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
+func (s *UDSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+}
 
 func (s *UDSuite) TestWorks(c *C) {
 	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{})
-	ud := New(endp, nullog)
+	ud := New(endp, s.log)
 	err := ud.DispatchURL("this")
 	c.Check(err, IsNil)
 }
 
 func (s *UDSuite) TestFailsIfCallFails(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
-	ud := New(endp, nullog)
+	ud := New(endp, s.log)
 	err := ud.DispatchURL("this")
 	c.Check(err, NotNil)
 }

=== modified file 'client/client_test.go'
--- client/client_test.go	2014-02-05 18:24:00 +0000
+++ client/client_test.go	2014-02-05 18:24:01 +0000
@@ -34,7 +34,6 @@
 	idtesting "launchpad.net/ubuntu-push/whoopsie/identifier/testing"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -55,11 +54,9 @@
 type clientSuite struct {
 	timeouts   []time.Duration
 	configPath string
+	log        logger.Logger
 }
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
-var noisylog = logger.NewSimpleLogger(os.Stderr, "debug")
-var debuglog = noisylog
 var _ = Suite(&clientSuite{})
 
 const (
@@ -85,7 +82,7 @@
 }
 
 func (cs *clientSuite) SetUpTest(c *C) {
-	debuglog.Debugf("---")
+	cs.log = helpers.NewTestLogger(c, "debug")
 	dir := c.MkDir()
 	cs.configPath = filepath.Join(dir, "config")
 	cfg := fmt.Sprintf(`
@@ -210,7 +207,7 @@
 
 func (cs *clientSuite) TestGetDeviceIdWorks(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.idder = identifier.New()
 	c.Check(cli.deviceId, Equals, "")
 	c.Check(cli.getDeviceId(), IsNil)
@@ -219,7 +216,7 @@
 
 func (cs *clientSuite) TestGetDeviceIdCanFail(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.idder = idtesting.Failing()
 	c.Check(cli.deviceId, Equals, "")
 	c.Check(cli.getDeviceId(), NotNil)
@@ -247,7 +244,7 @@
 	testibus.SetWatchTicker(cEndp, make(chan bool))
 	// ok, create the thing
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	err := cli.Configure(cs.configPath)
 	c.Assert(err, IsNil)
 	// the user actions channel has not been set up
@@ -276,7 +273,7 @@
 func (cs *clientSuite) TestTakeTheBusCanFail(c *C) {
 	cli := new(Client)
 	err := cli.Configure(cs.configPath)
-	cli.log = debuglog
+	cli.log = cs.log
 	c.Assert(err, IsNil)
 	// the user actions channel has not been set up
 	c.Check(cli.actionsCh, IsNil)
@@ -310,7 +307,7 @@
 
 func (cs *clientSuite) TestHandleConnStateD2C(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.initSession()
 
 	c.Assert(cli.hasConnectivity, Equals, false)
@@ -321,7 +318,7 @@
 
 func (cs *clientSuite) TestHandleConnStateSame(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	// here we want to check that we don't do anything
 	c.Assert(cli.session, IsNil)
 	c.Assert(cli.hasConnectivity, Equals, false)
@@ -335,8 +332,8 @@
 
 func (cs *clientSuite) TestHandleConnStateC2D(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
-	cli.session, _ = session.NewSession(string(cli.config.Addr), cli.pem, cli.config.ExchangeTimeout.Duration, cli.deviceId, debuglog)
+	cli.log = cs.log
+	cli.session, _ = session.NewSession(string(cli.config.Addr), cli.pem, cli.config.ExchangeTimeout.Duration, cli.deviceId, cs.log)
 	cli.session.Dial()
 	cli.hasConnectivity = true
 
@@ -348,8 +345,8 @@
 
 func (cs *clientSuite) TestHandleConnStateC2DPending(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
-	cli.session, _ = session.NewSession(string(cli.config.Addr), cli.pem, cli.config.ExchangeTimeout.Duration, cli.deviceId, debuglog)
+	cli.log = cs.log
+	cli.session, _ = session.NewSession(string(cli.config.Addr), cli.pem, cli.config.ExchangeTimeout.Duration, cli.deviceId, cs.log)
 	cli.hasConnectivity = true
 
 	cli.handleConnState(false)
@@ -376,7 +373,7 @@
 
 func (cs *clientSuite) TestHandleNotificationFail(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
 	cli.notificationsEndp = endp
 	c.Check(cli.handleNotification(), NotNil)
@@ -388,7 +385,7 @@
 
 func (cs *clientSuite) TestHandleClick(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), nil)
 	cli.urlDispatcherEndp = endp
 	c.Check(cli.handleClick(), IsNil)
@@ -405,7 +402,7 @@
 
 func (cs *clientSuite) TestDoLoopConn(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.connCh = make(chan bool, 1)
 	cli.connCh <- true
 	cli.initSession()
@@ -417,7 +414,7 @@
 
 func (cs *clientSuite) TestDoLoopClick(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.initSession()
 	aCh := make(chan notifications.RawActionReply, 1)
 	aCh <- notifications.RawActionReply{}
@@ -430,7 +427,7 @@
 
 func (cs *clientSuite) TestDoLoopNotif(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.initSession()
 	cli.session.MsgCh = make(chan *session.Notification, 1)
 	cli.session.MsgCh <- &session.Notification{}
@@ -442,7 +439,7 @@
 
 func (cs *clientSuite) TestDoLoopErr(c *C) {
 	cli := new(Client)
-	cli.log = debuglog
+	cli.log = cs.log
 	cli.initSession()
 	cli.session.ErrCh = make(chan error, 1)
 	cli.session.ErrCh <- nil

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2014-02-05 18:24:00 +0000
+++ client/session/session_test.go	2014-02-05 18:24:01 +0000
@@ -29,7 +29,6 @@
 	helpers "launchpad.net/ubuntu-push/testing"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"net"
-	"os"
 	"reflect"
 	"testing"
 	"time"
@@ -37,11 +36,10 @@
 
 func TestSession(t *testing.T) { TestingT(t) }
 
-type clientSessionSuite struct{}
+type clientSessionSuite struct {
+	log logger.Logger
+}
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
-var noisylog = logger.NewSimpleLogger(os.Stderr, "debug")
-var debuglog = nullog
 var _ = Suite(&clientSessionSuite{})
 
 //
@@ -158,12 +156,16 @@
 	return nil
 }
 
+func (cs *clientSessionSuite) SetUpTest(c *C) {
+	cs.log = helpers.NewTestLogger(c, "debug")
+}
+
 /****************************************************************
   NewSession() tests
 ****************************************************************/
 
 func (cs *clientSessionSuite) TestNewSessionPlainWorks(c *C) {
-	sess, err := NewSession("", nil, 0, "", nullog)
+	sess, err := NewSession("", nil, 0, "", cs.log)
 	c.Check(sess, NotNil)
 	c.Check(err, IsNil)
 	// but no root CAs set
@@ -175,7 +177,7 @@
 var pem, _ = ioutil.ReadFile(certfile)
 
 func (cs *clientSessionSuite) TestNewSessionPEMWorks(c *C) {
-	sess, err := NewSession("", pem, 0, "wah", nullog)
+	sess, err := NewSession("", pem, 0, "wah", cs.log)
 	c.Check(sess, NotNil)
 	c.Assert(err, IsNil)
 	c.Check(sess.TLS.RootCAs, NotNil)
@@ -183,7 +185,7 @@
 
 func (cs *clientSessionSuite) TestNewSessionBadPEMFileContentFails(c *C) {
 	badpem := []byte("This is not the PEM you're looking for.")
-	sess, err := NewSession("", badpem, 0, "wah", nullog)
+	sess, err := NewSession("", badpem, 0, "wah", cs.log)
 	c.Check(sess, IsNil)
 	c.Check(err, NotNil)
 }
@@ -193,7 +195,7 @@
 ****************************************************************/
 
 func (cs *clientSessionSuite) TestConnectFailsWithNoAddress(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	err = sess.connect()
 	c.Check(err, ErrorMatches, ".*connect.*address.*")
@@ -204,7 +206,7 @@
 	srv, err := net.Listen("tcp", "localhost:0")
 	c.Assert(err, IsNil)
 	defer srv.Close()
-	sess, err := NewSession(srv.Addr().String(), nil, 0, "wah", debuglog)
+	sess, err := NewSession(srv.Addr().String(), nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	err = sess.connect()
 	c.Check(err, IsNil)
@@ -215,7 +217,7 @@
 func (cs *clientSessionSuite) TestConnectConnectFail(c *C) {
 	srv, err := net.Listen("tcp", "localhost:0")
 	c.Assert(err, IsNil)
-	sess, err := NewSession(srv.Addr().String(), nil, 0, "wah", debuglog)
+	sess, err := NewSession(srv.Addr().String(), nil, 0, "wah", cs.log)
 	srv.Close()
 	c.Assert(err, IsNil)
 	err = sess.connect()
@@ -228,7 +230,7 @@
 ****************************************************************/
 
 func (cs *clientSessionSuite) TestClose(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestClose"}
 	sess.Close()
@@ -237,7 +239,7 @@
 }
 
 func (cs *clientSessionSuite) TestCloseTwice(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestCloseTwice"}
 	sess.Close()
@@ -248,7 +250,7 @@
 }
 
 func (cs *clientSessionSuite) TestCloseFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestCloseFails", CloseCondition: condition.Work(false)}
 	sess.Close()
@@ -262,7 +264,7 @@
 func (d *derp) Stop()        { d.stopped = true }
 
 func (cs *clientSessionSuite) TestCloseStopsRetrier(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	ar := new(derp)
 	sess.retrier = ar
@@ -279,7 +281,7 @@
 
 func (cs *clientSessionSuite) TestAutoRedialWorks(c *C) {
 	// checks that AutoRedial sets up a retrier and tries redialing it
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	ar := new(derp)
 	sess.retrier = ar
@@ -290,7 +292,7 @@
 
 func (cs *clientSessionSuite) TestAutoRedialStopsRetrier(c *C) {
 	// checks that AutoRedial stops the previous retrier
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	ch := make(chan uint32)
 	c.Check(sess.retrier, IsNil)
@@ -315,7 +317,7 @@
 
 func (s *msgSuite) SetUpTest(c *C) {
 	var err error
-	s.sess, err = NewSession("", nil, time.Millisecond, "wah", debuglog)
+	s.sess, err = NewSession("", nil, time.Millisecond, "wah", helpers.NewTestLogger(c, "debug"))
 	c.Assert(err, IsNil)
 	s.sess.Connection = &testConn{Name: "TestHandle*"}
 	s.errCh = make(chan error, 1)
@@ -467,7 +469,7 @@
   start() tests
 ****************************************************************/
 func (cs *clientSessionSuite) TestStartFailsIfSetDeadlineFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartFailsIfSetDeadlineFails",
 		DeadlineCondition: condition.Work(false)} // setdeadline will fail
@@ -477,7 +479,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartFailsIfWriteFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartFailsIfWriteFails",
 		WriteCondition: condition.Work(false)} // write will fail
@@ -487,7 +489,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartConnectMessageFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartConnectMessageFails"}
 	errCh := make(chan error, 1)
@@ -513,7 +515,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartConnackReadError(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartConnackReadError"}
 	errCh := make(chan error, 1)
@@ -537,7 +539,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartBadConnack(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartBadConnack"}
 	errCh := make(chan error, 1)
@@ -561,7 +563,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartNotConnack(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartBadConnack"}
 	errCh := make(chan error, 1)
@@ -585,7 +587,7 @@
 }
 
 func (cs *clientSessionSuite) TestStartWorks(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Connection = &testConn{Name: "TestStartWorks"}
 	errCh := make(chan error, 1)
@@ -617,7 +619,7 @@
 ****************************************************************/
 
 func (cs *clientSessionSuite) TestRunBailsIfConnectFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	failure := errors.New("TestRunBailsIfConnectFails")
 	has_closed := false
@@ -631,7 +633,7 @@
 }
 
 func (cs *clientSessionSuite) TestRunBailsIfStartFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	failure := errors.New("TestRunBailsIfStartFails")
 	err = sess.run(
@@ -643,7 +645,7 @@
 }
 
 func (cs *clientSessionSuite) TestRunRunsEvenIfLoopFails(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	// just to make a point: until here we haven't set ErrCh & MsgCh (no
 	// biggie if this stops being true)
@@ -671,8 +673,8 @@
   Jitter() tests
 ****************************************************************/
 
-func (s *clientSessionSuite) TestJitter(c *C) {
-	sess, err := NewSession("", nil, 0, "wah", helpers.NewTestLogger(c, "debug"))
+func (cs *clientSessionSuite) TestJitter(c *C) {
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	num_tries := 20       // should do the math
 	spread := time.Second //
@@ -704,7 +706,7 @@
 
 func (cs *clientSessionSuite) TestDialPanics(c *C) {
 	// one last unhappy test
-	sess, err := NewSession("", nil, 0, "wah", helpers.NewTestLogger(c, "debug"))
+	sess, err := NewSession("", nil, 0, "wah", cs.log)
 	c.Assert(err, IsNil)
 	sess.Protocolator = nil
 	c.Check(sess.Dial, PanicMatches, ".*protocol constructor.")
@@ -722,7 +724,7 @@
 	timeout := 100 * time.Millisecond
 	lst, err := tls.Listen("tcp", "localhost:0", tlsCfg)
 	c.Assert(err, IsNil)
-	sess, err := NewSession(lst.Addr().String(), nil, timeout, "wah", debuglog)
+	sess, err := NewSession(lst.Addr().String(), nil, timeout, "wah", cs.log)
 	c.Assert(err, IsNil)
 	tconn := &testConn{CloseCondition: condition.Fail2Work(10)}
 	sess.Connection = tconn

=== modified file 'util/redialer_test.go'
--- util/redialer_test.go	2014-02-05 18:24:00 +0000
+++ util/redialer_test.go	2014-02-05 18:24:01 +0000
@@ -17,11 +17,9 @@
 package util
 
 import (
-	"io/ioutil"
 	. "launchpad.net/gocheck"
 	"launchpad.net/ubuntu-push/bus"
 	testibus "launchpad.net/ubuntu-push/bus/testing"
-	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/testing/condition"
 	"testing"
 	"time"
@@ -34,7 +32,6 @@
 	timeouts []time.Duration
 }
 
-var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
 var _ = Suite(&RedialerSuite{})
 
 func (s *RedialerSuite) SetUpSuite(c *C) {