Merge lp:~chipaca/ubuntu-push/endpoint-not-bus into lp:ubuntu-push

[John Lenton]

change a few of the bus/* services to take a bus.Endpoint instead of a bus.Bus

change a few of the bus/* services to take a bus.Endpoint instead of a bus.Bus

[Samuele Pedroni (pedronis)]

I see where this is going from the other branches,

the interfaces where you have to hand over a nm endpoint to connectivity is a bit strange though

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~chipaca/ubuntu-push/bus-reorg has not yet been merged into https://code.launchpad.net/~ubuntu-push-hackers/ubuntu-push/trunk.

=== modified file 'bus/notifications/raw.go'
--- bus/notifications/raw.go	2014-01-24 13:21:18 +0000
+++ bus/notifications/raw.go	2014-01-24 13:21:18 +0000
@@ -52,14 +52,9 @@
 	log logger.Logger
 }
 
-// Raw returns a new RawNotifications connected to the provided bus.Bus
-func Raw(bt bus.Bus, log logger.Logger) (*RawNotifications, error) {
-	endp, err := bt.Connect(BusAddress, log)
-	if err != nil {
-		return nil, err
-	}
-
-	return &RawNotifications{endp, log}, nil
+// Raw returns a new RawNotifications that'll use the provided bus.Endpoint
+func Raw(endp bus.Endpoint, log logger.Logger) *RawNotifications {
+	return &RawNotifications{endp, log}
 }
 
 /*

=== modified file 'bus/notifications/raw_test.go'
--- bus/notifications/raw_test.go	2014-01-24 13:21:18 +0000
+++ bus/notifications/raw_test.go	2014-01-24 13:21:18 +0000
@@ -38,47 +38,32 @@
 
 var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
 
-func (s *RawSuite) TestConnects(c *C) {
-	bus := testibus.NewTestingBus(condition.Work(false), condition.Work(false))
-	_, err := Raw(bus, nullog)
-	c.Check(err, NotNil)
-	bus = testibus.NewTestingBus(condition.Work(true), condition.Work(false))
-	_, err = Raw(bus, nullog)
-	c.Check(err, IsNil)
-}
-
 func (s *RawSuite) TestNotifies(c *C) {
-	bus := testibus.NewTestingBus(condition.Work(true), condition.Work(true),
-		uint32(1))
-	raw, err := Raw(bus, nullog)
-	c.Assert(err, IsNil)
+	endp := testibus.NewTestingEndpoint(condition.Work(true), uint32(1))
+	raw := Raw(endp, nullog)
 	nid, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, IsNil)
 	c.Check(nid, Equals, uint32(1))
 }
 
 func (s *RawSuite) TestNotifiesFails(c *C) {
-	bus := testibus.NewTestingBus(condition.Work(true), condition.Work(false))
-	raw, err := Raw(bus, nullog)
-	c.Assert(err, IsNil)
-	_, err = raw.Notify("", 0, "", "", "", nil, nil, 0)
+	endp := testibus.NewTestingEndpoint(condition.Work(false))
+	raw := Raw(endp, nullog)
+	_, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, NotNil)
 }
 
 func (s *RawSuite) TestNotifiesFailsWeirdly(c *C) {
-	bus := testibus.NewMultiValuedTestingBus(condition.Work(true), condition.Work(true),
-		[]interface{}{1, 2})
-	raw, err := Raw(bus, nullog)
-	c.Assert(err, IsNil)
-	_, err = raw.Notify("", 0, "", "", "", nil, nil, 0)
+	endp := testibus.NewMultiValuedTestingEndpoint(condition.Work(true), []interface{}{1, 2})
+	raw := Raw(endp, nullog)
+	_, err := raw.Notify("", 0, "", "", "", nil, nil, 0)
 	c.Check(err, NotNil)
 }
 
 func (s *RawSuite) TestWatchActions(c *C) {
-	bus := testibus.NewMultiValuedTestingBus(condition.Work(true), condition.Work(true),
+	endp := testibus.NewMultiValuedTestingEndpoint(condition.Work(true),
 		[]interface{}{uint32(1), "hello"})
-	raw, err := Raw(bus, nullog)
-	c.Assert(err, IsNil)
+	raw := Raw(endp, nullog)
 	ch, err := raw.WatchActions()
 	c.Assert(err, IsNil)
 	// check we get the right action reply
@@ -95,9 +80,8 @@
 }
 
 func (s *RawSuite) TestWatchActionsFails(c *C) {
-	bus := testibus.NewTestingBus(condition.Work(true), condition.Work(false))
-	raw, err := Raw(bus, nullog)
-	c.Assert(err, IsNil)
-	_, err = raw.WatchActions()
+	endp := testibus.NewTestingEndpoint(condition.Work(false))
+	raw := Raw(endp, nullog)
+	_, err := raw.WatchActions()
 	c.Check(err, NotNil)
 }

=== modified file 'bus/urldispatcher/urldispatcher.go'
--- bus/urldispatcher/urldispatcher.go	2014-01-24 13:21:18 +0000
+++ bus/urldispatcher/urldispatcher.go	2014-01-24 13:21:18 +0000
@@ -40,13 +40,9 @@
 	log  logger.Logger
 }
 
-// New builds a new URL dispatcher by connecting to the provided bus.
-func New(bus bus.Bus, log logger.Logger) (URLDispatcher, error) {
-	endp, err := bus.Connect(BusAddress, log)
-	if err != nil {
-		return nil, err
-	}
-	return &urlDispatcher{endp, log}, nil
+// New builds a new URL dispatcher that uses the provided bus.Endpoint
+func New(endp bus.Endpoint, log logger.Logger) URLDispatcher {
+	return &urlDispatcher{endp, log}
 }
 
 var _ URLDispatcher = &urlDispatcher{} // ensures it conforms

=== modified file 'bus/urldispatcher/urldispatcher_test.go'
--- bus/urldispatcher/urldispatcher_test.go	2014-01-24 13:21:18 +0000
+++ bus/urldispatcher/urldispatcher_test.go	2014-01-24 13:21:18 +0000
@@ -35,23 +35,15 @@
 var nullog = logger.NewSimpleLogger(ioutil.Discard, "error")
 
 func (s *UDSuite) TestWorks(c *C) {
-	tb := testibus.NewMultiValuedTestingBus(condition.Work(true), condition.Work(true), []interface{}{})
-	ud, err := New(tb, nullog)
-	c.Assert(err, IsNil)
-	err = ud.DispatchURL("this")
+	endp := testibus.NewMultiValuedTestingEndpoint(condition.Work(true), []interface{}{})
+	ud := New(endp, nullog)
+	err := ud.DispatchURL("this")
 	c.Check(err, IsNil)
 }
 
-func (s *UDSuite) TestFailsIfConnectFails(c *C) {
-	tb := testibus.NewTestingBus(condition.Work(false), condition.Work(true))
-	_, err := New(tb, nullog)
-	c.Check(err, NotNil)
-}
-
 func (s *UDSuite) TestFailsIfCallFails(c *C) {
-	tb := testibus.NewTestingBus(condition.Work(true), condition.Work(false))
-	ud, err := New(tb, nullog)
-	c.Assert(err, IsNil)
-	err = ud.DispatchURL("this")
+	endp := testibus.NewTestingEndpoint(condition.Work(false))
+	ud := New(endp, nullog)
+	err := ud.DispatchURL("this")
 	c.Check(err, NotNil)
 }