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

[John Lenton]

made bus.Endpoint's WatchSignal use an (exported) channel for waiting between sending values, if the channel is not nil.

made bus.Endpoint's WatchSignal use an (exported) channel for waiting between sending values, if the channel is not nil.

[lp:~chipaca/ubuntu-push/bus-endpoint-wachticker]

32. By John Lenton on 2014-01-27

Merged actual-client-v0 into bus-endpoint-wachticker.

33. By John Lenton on 2014-01-27

got rid of useless chicken scratchings

[Samuele Pedroni (pedronis)]

66 +var WatchTicker chan rune

using a rune here is a bit confusing, maybe

type TickT rune

const Tick TickT = 'x'

chan TickT

37 + for _, b := range expected.ticks {
38 + testingbus.WatchTicker <- b
39 + }

that's cute but also fairly obscure, also b sounds like a byte or boolean, not rune, expected ticks cool be just a bool no? or are always ticking once or not

[John Lenton (chipaca)]

or it could be an int, and we send over that many bools.

Unmerged revisions

33. By John Lenton on 2014-01-27

got rid of useless chicken scratchings

32. By John Lenton on 2014-01-27

Merged actual-client-v0 into bus-endpoint-wachticker.

31. By John Lenton on 2014-01-27

made bus.Endpoint's WatchSignal use an (exported) channel for waiting between sending values, if the channel is not nil.

30. By John Lenton on 2014-01-27

Used an anon struct to get more information about each iter through the loop in connnectivity_test's TestRun.

29. By John Lenton on 2014-01-27

merged pipeline; conflict in the redialer fixed

28. By John Lenton on 2014-01-27

moved client config to etc

=== modified file 'bus/connectivity/connectivity_test.go'
--- bus/connectivity/connectivity_test.go	2014-01-27 18:45:28 +0000
+++ bus/connectivity/connectivity_test.go	2014-01-27 18:45:28 +0000
@@ -196,29 +196,39 @@
 		uint32(networkmanager.Disconnected),
 	)
 
+	testingbus.WatchTicker = make(chan rune)
+	defer func() { testingbus.WatchTicker = nil }()
+
 	out := make(chan bool)
 	dt := time.Second / 10
 	timer := time.NewTimer(dt)
 	go ConnectedState(endp, cfg, nullog, out)
 	var v bool
-	expecteds := []bool{
-		false, // first state is always false
-		true,  // then it should be true as per ConnectedGlobal above
-		false, // then, false (upon receiving the next ConnectedGlobal)
-		true,  // then it should be true (webcheck passed)
-		false, // then it should be false (Disconnected)
-		false, // then it should be false again because it's restarted
+	expecteds := []struct {
+		p     bool
+		s     string
+		ticks string
+	}{
+		{false, "first state is always false", ""},
+		{true, "then it should be true as per ConnectedGlobal above", ""},
+		{false, "then, false (upon receiving the next ConnectedGlobal)", "x"},
+		{true, "then it should be true (webcheck passed)", ""},
+		{false, "then it should be false (Disconnected)", "x"},
+		{false, "then it should be false again because it's restarted", "x"},
 	}
 
 	for i, expected := range expecteds {
+		for _, b := range expected.ticks {
+			testingbus.WatchTicker <- b
+		}
 		timer.Reset(dt)
 		select {
 		case v = <-out:
 			break
 		case <-timer.C:
-			c.Fatalf("Timed out before getting value (#%d)", i+1)
+			c.Fatalf("Timed out before getting value (#%d: %s)", i+1, expected.s)
 		}
 
-		c.Check(v, Equals, expected)
+		c.Check(v, Equals, expected.p, Commentf(expected.s))
 	}
 }

=== modified file 'bus/testing/testing_endpoint.go'
--- bus/testing/testing_endpoint.go	2014-01-27 12:41:54 +0000
+++ bus/testing/testing_endpoint.go	2014-01-27 18:45:28 +0000
@@ -49,6 +49,13 @@
 	return &testingEndpoint{dialCond, callCond, retvalses}
 }
 
+// if WatchTickeris not nil, it is used instead of the default timeout
+// to wait while sending values over WatchSignal
+//
+// It's chan rune merely for convenience to testers; the value is
+// discarded.
+var WatchTicker chan rune
+
 // See Endpoint's WatchSignal. This WatchSignal will check its condition to
 // decide whether to return an error, or provide each of its return values
 func (tc *testingEndpoint) WatchSignal(member string, f func(...interface{}), d func()) error {
@@ -56,7 +63,11 @@
 		go func() {
 			for _, v := range tc.retvals {
 				f(v...)
-				time.Sleep(10 * time.Millisecond)
+				if WatchTicker != nil {
+					<-WatchTicker
+				} else {
+					<-time.Tick(10 * time.Millisecond)
+				}
 			}
 			d()
 		}()

=== modified file 'bus/testing/testing_endpoint_test.go'
--- bus/testing/testing_endpoint_test.go	2014-01-27 12:41:54 +0000
+++ bus/testing/testing_endpoint_test.go	2014-01-27 18:45:28 +0000
@@ -101,6 +101,35 @@
 	c.Check(e, NotNil)
 }
 
+// Test WatchSignal can use the WatchTicker instead of a timeout (if
+// the former is not nil)
+func (s *TestingEndpointSuite) TestWatchTicker(c *C) {
+	WatchTicker = make(chan rune, 3)
+	defer func() { WatchTicker = nil }()
+	WatchTicker <- 'x'
+	WatchTicker <- 'x'
+	WatchTicker <- 'x'
+	c.Assert(len(WatchTicker), Equals, 3)
+
+	endp := NewTestingEndpoint(nil, condition.Work(true), 0, 0)
+	ch := make(chan int)
+	e := endp.WatchSignal("what", func(us ...interface{}) {}, func() { close(ch) })
+	c.Check(e, IsNil)
+
+	// wait for the destructor to be called
+Out:
+	for {
+		select {
+		case <-ch:
+			break Out
+		case <-time.Tick(time.Millisecond):
+		}
+	}
+
+	// now if all went well, the ticker will have been tuck twice.
+	c.Assert(len(WatchTicker), Equals, 1)
+}
+
 // Tests that GetProperty() works
 func (s *TestingEndpointSuite) TestGetProperty(c *C) {
 	var m uint32 = 42