← Back to branch summary

~sinzui/ubuntu/wily/juju-core/wily-1.24.7

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/worker/periodicworker_test.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-09-22 15:27:01 UTC
  • mfrom: (1.1.36)
  • Revision ID: package-import@ubuntu.com-20150922152701-lzq2yhn2uaahrdqu
Tags: 1.24.6-0ubuntu1
https://launchpad.net/bugs/1481556
* New upstream release (LP: #1481556).
* d/copyright updated for Juju 1.24.6 (Last verified commit changes).
* d/tests/* Run tests with upstart when Juju version before 1.23.
* Prefer gccgo-5 for ppc64el and arm64 in build-deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/worker/periodicworker_test.go
28
28
                return testError
29
29
        }
30
30
 
31
 
        w := NewPeriodicWorker(doWork, defaultPeriod)
 
31
        w := NewPeriodicWorker(doWork, defaultPeriod, NewTimer)
32
32
        defer func() { c.Assert(Stop(w), gc.Equals, testError) }()
33
33
        select {
34
34
        case <-funcHasRun:
54
54
                return nil
55
55
        }
56
56
 
57
 
        w := NewPeriodicWorker(doWork, defaultPeriod)
 
57
        w := NewPeriodicWorker(doWork, defaultPeriod, NewTimer)
58
58
        defer func() { c.Assert(Stop(w), gc.IsNil) }()
59
59
        select {
60
60
        case <-funcHasRun:
94
94
                return returnValue
95
95
        }
96
96
 
97
 
        w := NewPeriodicWorker(doWork, defaultPeriod)
 
97
        w := NewPeriodicWorker(doWork, defaultPeriod, NewTimer)
98
98
        defer func() { c.Assert(Stop(w), gc.Equals, expected) }()
99
99
 
100
100
        select {
126
126
 
127
127
        period := time.Millisecond * 500
128
128
        unacceptableWait := time.Second * 10
129
 
        w := NewPeriodicWorker(doWork, period)
 
129
        w := NewPeriodicWorker(doWork, period, NewTimer)
130
130
        defer func() { c.Assert(Stop(w), gc.IsNil) }()
131
131
        for i := 0; i < 5; i++ {
132
132
                select {