~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/worker/environ/environ_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
                c.Assert(err, jc.ErrorIsNil)
153
153
                defer workertest.DirtyKill(c, tracker)
154
154
 
155
 
                context.CloseNotify()
 
155
                context.CloseModelConfigNotify()
156
156
                err = workertest.CheckKilled(c, tracker)
157
157
                c.Check(err, gc.ErrorMatches, "environ config watch closed")
158
158
                context.CheckCallNames(c, "ModelConfig", "CloudSpec", "WatchForModelConfigChanges")
173
173
                c.Check(err, jc.ErrorIsNil)
174
174
                defer workertest.DirtyKill(c, tracker)
175
175
 
176
 
                context.SendNotify()
 
176
                context.SendModelConfigNotify()
177
177
                err = workertest.CheckKilled(c, tracker)
178
178
                c.Check(err, gc.ErrorMatches, "cannot read environ config: blam ouch")
179
179
                context.CheckCallNames(c, "ModelConfig", "CloudSpec", "WatchForModelConfigChanges", "ModelConfig")
194
194
                c.Check(err, jc.ErrorIsNil)
195
195
                defer workertest.DirtyKill(c, tracker)
196
196
 
197
 
                context.SendNotify()
 
197
                context.SendModelConfigNotify()
198
198
                err = workertest.CheckKilled(c, tracker)
199
199
                c.Check(err, gc.ErrorMatches, "cannot update environ config: SetConfig is broken")
200
200
                context.CheckCallNames(c, "ModelConfig", "CloudSpec", "WatchForModelConfigChanges", "ModelConfig")
223
223
 
224
224
                timeout := time.After(coretesting.LongWait)
225
225
                attempt := time.After(0)
226
 
                context.SendNotify()
 
226
                context.SendModelConfigNotify()
227
227
                for {
228
228
                        select {
229
229
                        case <-attempt: