1
=== modified file 'worker/resumer/resumer_test.go'
2
--- worker/resumer/resumer_test.go	2013-06-21 00:19:44 +0000
3
+++ worker/resumer/resumer_test.go	2013-06-27 18:05:33 +0000
4
@@ -34,24 +34,36 @@
5
34
func (s *ResumerSuite) TestResumerCalls(c *C) {
34
func (s *ResumerSuite) TestResumerCalls(c *C) {
6
35
	// Shorter interval and mock help to count
35
	// Shorter interval and mock help to count
7
36
	// the resumer calls in a given timespan.
36
	// the resumer calls in a given timespan.
9
37
	resumer.SetInterval(10 * time.Millisecond)
37
	testInterval := 10 * time.Millisecond
10
38
	resumer.SetInterval(testInterval)
11
38
	defer resumer.RestoreInterval()
39
	defer resumer.RestoreInterval()
12
39
40
14
40
	tr := &transactionResumerMock{0}
41
	tr := &transactionResumerMock{[]time.Time{}}
15
41
	rr := resumer.NewResumer(tr)
42
	rr := resumer.NewResumer(tr)
16
42
	defer func() { c.Assert(rr.Stop(), IsNil) }()
43
	defer func() { c.Assert(rr.Stop(), IsNil) }()
17
43
44
20
44
	time.Sleep(55 * time.Millisecond)
45
	time.Sleep(10 * testInterval)
21
45
	c.Assert(tr.counter, Equals, 5)
46
22
47
	// Check that a numner of calls has happened with a time
23
48
	// difference somewhere between the interval and twice the
24
49
	// interval. A more precise time behavior cannot be 
25
50
	// specified due to the load during the test.
26
51
	c.Assert(len(tr.timestamps) > 0, Equals, true)
27
52
	for i := 1; i < len(tr.timestamps); i++ {
28
53
		diff := tr.timestamps[i].Sub(tr.timestamps[i-1])
29
54
30
55
		c.Assert(diff >= testInterval, Equals, true)
31
56
		c.Assert(diff <= 2*testInterval, Equals, true)
32
57
	}
33
46
}
58
}
34
47
59
35
48
// transactionResumerMock is used to check the
60
// transactionResumerMock is used to check the
36
49
// calls of ResumeTransactions().
61
// calls of ResumeTransactions().
37
50
type transactionResumerMock struct {
62
type transactionResumerMock struct {
39
51
	counter int
63
	timestamps []time.Time
40
52
}
64
}
41
53
65
44
54
func (t *transactionResumerMock) ResumeTransactions() error {
66
func (tr *transactionResumerMock) ResumeTransactions() error {
45
55
	t.counter++
67
	tr.timestamps = append(tr.timestamps, time.Now())
46
56
	return nil
68
	return nil
47
57
}
69
}
Status:	Merged
Approved by:	Frank Mueller on 2013-06-27
Approved revision:	no longer in the source branch.
Merged at revision:	1351
Proposed branch:	lp:~themue/juju-core/031-fix-resumer-test
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	47 lines (+19/-7) 1 file modified worker/resumer/resumer_test.go (+19/-7)
To merge this branch:	bzr merge lp:~themue/juju-core/031-fix-resumer-test
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-06-25	Pending
Review via email: mp+171342@code.launchpad.net
1	=== modified file 'worker/resumer/resumer_test.go'
2	--- worker/resumer/resumer_test.go 2013-06-21 00:19:44 +0000
3	+++ worker/resumer/resumer_test.go 2013-06-27 18:05:33 +0000
4	@@ -34,24 +34,36 @@
5	34	func (s ResumerSuite) TestResumerCalls(c C) {	34	func (s ResumerSuite) TestResumerCalls(c C) {
6	35	// Shorter interval and mock help to count	35	// Shorter interval and mock help to count
7	36	// the resumer calls in a given timespan.	36	// the resumer calls in a given timespan.
9	37	resumer.SetInterval(10 * time.Millisecond)	37	testInterval := 10 * time.Millisecond
10			38	resumer.SetInterval(testInterval)
11	38	defer resumer.RestoreInterval()	39	defer resumer.RestoreInterval()
12	39		40
14	40	tr := &transactionResumerMock{0}	41	tr := &transactionResumerMock{[]time.Time{}}
15	41	rr := resumer.NewResumer(tr)	42	rr := resumer.NewResumer(tr)
16	42	defer func() { c.Assert(rr.Stop(), IsNil) }()	43	defer func() { c.Assert(rr.Stop(), IsNil) }()
17	43		44
20	44	time.Sleep(55 * time.Millisecond)	45	time.Sleep(10 * testInterval)
21	45	c.Assert(tr.counter, Equals, 5)	46
22			47	// Check that a numner of calls has happened with a time
23			48	// difference somewhere between the interval and twice the
24			49	// interval. A more precise time behavior cannot be
25			50	// specified due to the load during the test.
26			51	c.Assert(len(tr.timestamps) > 0, Equals, true)
27			52	for i := 1; i < len(tr.timestamps); i++ {
28			53	diff := tr.timestamps[i].Sub(tr.timestamps[i-1])
29			54
30			55	c.Assert(diff >= testInterval, Equals, true)
31			56	c.Assert(diff <= 2*testInterval, Equals, true)
32			57	}
33	46	}	58	}
34	47		59
35	48	// transactionResumerMock is used to check the	60	// transactionResumerMock is used to check the
36	49	// calls of ResumeTransactions().	61	// calls of ResumeTransactions().
37	50	type transactionResumerMock struct {	62	type transactionResumerMock struct {
39	51	counter int	63	timestamps []time.Time
40	52	}	64	}
41	53		65
44	54	func (t *transactionResumerMock) ResumeTransactions() error {	66	func (tr *transactionResumerMock) ResumeTransactions() error {
45	55	t.counter++	67	tr.timestamps = append(tr.timestamps, time.Now())
46	56	return nil	68	return nil
47	57	}	69	}