LEFT | RIGHT |
1 package uniter | 1 package uniter |
2 | 2 |
3 import ( | 3 import ( |
4 . "launchpad.net/gocheck" | 4 . "launchpad.net/gocheck" |
5 "launchpad.net/juju-core/charm" | 5 "launchpad.net/juju-core/charm" |
6 "launchpad.net/juju-core/juju/testing" | 6 "launchpad.net/juju-core/juju/testing" |
7 "launchpad.net/juju-core/state" | 7 "launchpad.net/juju-core/state" |
| 8 "launchpad.net/juju-core/worker" |
8 "time" | 9 "time" |
9 ) | 10 ) |
10 | 11 |
11 type FilterSuite struct { | 12 type FilterSuite struct { |
12 testing.JujuConnSuite | 13 testing.JujuConnSuite |
13 ch *state.Charm | 14 ch *state.Charm |
14 svc *state.Service | 15 svc *state.Service |
15 unit *state.Unit | 16 unit *state.Unit |
16 } | 17 } |
17 | 18 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 assertClosed() | 66 assertClosed() |
66 | 67 |
67 err = s.unit.EnsureDead() | 68 err = s.unit.EnsureDead() |
68 c.Assert(err, IsNil) | 69 c.Assert(err, IsNil) |
69 s.State.StartSync() | 70 s.State.StartSync() |
70 select { | 71 select { |
71 case <-f.Dying(): | 72 case <-f.Dying(): |
72 case <-time.After(50 * time.Millisecond): | 73 case <-time.After(50 * time.Millisecond): |
73 c.Fatalf("dead not detected") | 74 c.Fatalf("dead not detected") |
74 } | 75 } |
75 » c.Assert(f.Wait(), Equals, ErrDead) | 76 » c.Assert(f.Wait(), Equals, worker.ErrDead) |
76 } | 77 } |
77 | 78 |
78 func (s *FilterSuite) TestServiceDeath(c *C) { | 79 func (s *FilterSuite) TestServiceDeath(c *C) { |
79 f := newFilter(s.unit) | 80 f := newFilter(s.unit) |
80 defer f.Stop() | 81 defer f.Stop() |
81 s.State.StartSync() | 82 s.State.StartSync() |
82 select { | 83 select { |
83 case <-time.After(50 * time.Millisecond): | 84 case <-time.After(50 * time.Millisecond): |
84 case <-f.unitDying(): | 85 case <-f.unitDying(): |
85 c.Fatalf("unexpected receive") | 86 c.Fatalf("unexpected receive") |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 _, err = node.Write() | 265 _, err = node.Write() |
265 c.Assert(err, IsNil) | 266 c.Assert(err, IsNil) |
266 f.wantConfigEvent() | 267 f.wantConfigEvent() |
267 node.Set("outlook", "precipitous") | 268 node.Set("outlook", "precipitous") |
268 _, err = node.Write() | 269 _, err = node.Write() |
269 c.Assert(err, IsNil) | 270 c.Assert(err, IsNil) |
270 f.wantConfigEvent() | 271 f.wantConfigEvent() |
271 assertChange() | 272 assertChange() |
272 assertNoChange() | 273 assertNoChange() |
273 } | 274 } |
LEFT | RIGHT |