Merge lp:~chipaca/ubuntu-push/coverage-on-bus-testing into lp:ubuntu-push/automatic

[John Lenton]

100% coverage on bus/testing

100% coverage on bus/testing, fwiw.

[Samuele Pedroni (pedronis)]

see inline comment

review: Approve

[lp:~chipaca/ubuntu-push/coverage-on-bus-testing]

173. By John Lenton on 2014-06-02

fixed comment on test

=== modified file 'bus/testing/testing_endpoint_test.go'
--- bus/testing/testing_endpoint_test.go	2014-05-15 12:27:32 +0000
+++ bus/testing/testing_endpoint_test.go	2014-06-02 10:04:51 +0000
@@ -76,6 +76,24 @@
 		[]callArgs{{"what", []interface{}{"is", "this", "thing"}}})
 }
 
+// Test that Call() fails but does not explode when asked to return values
+// that can't be packed into a dbus message.
+func (s *TestingEndpointSuite) TestCallFailsOnBadRetval(c *C) {
+	endp := NewTestingEndpoint(nil, condition.Work(true), Equals)
+	var r uint32
+	e := endp.Call("what", bus.Args(), &r)
+	c.Check(e, NotNil)
+}
+
+// Test that Call() fails but does not explode when given an improper result
+// destination (one into which the dbus response can't be stuffed).
+func (s *TestingEndpointSuite) TestCallFailsOnBadArg(c *C) {
+	endp := NewTestingEndpoint(nil, condition.Work(true), 1)
+	r := func() {}
+	e := endp.Call("what", bus.Args(), &r)
+	c.Check(e, NotNil)
+}
+
 // Test that WatchSignal() with a positive condition sends the provided return
 // values over the channel.
 func (s *TestingEndpointSuite) TestWatch(c *C) {