← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to worker/uniter/state_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/uniter/state_test.go
4
4
        . "launchpad.net/gocheck"
5
5
        "launchpad.net/juju-core/charm"
6
6
        "launchpad.net/juju-core/charm/hooks"
7
 
        "launchpad.net/juju-core/trivial"
 
7
        "launchpad.net/juju-core/utils"
8
8
        "launchpad.net/juju-core/worker/uniter"
9
9
        "launchpad.net/juju-core/worker/uniter/hook"
10
10
        "path/filepath"
154
154
                }
155
155
                if t.err != "" {
156
156
                        c.Assert(write, PanicMatches, "invalid uniter state: "+t.err)
157
 
                        err := trivial.WriteYaml(path, &t.st)
 
157
                        err := utils.WriteYaml(path, &t.st)
158
158
                        c.Assert(err, IsNil)
159
159
                        _, err = file.Read()
160
160
                        c.Assert(err, ErrorMatches, "cannot read charm state at .*: invalid uniter state: "+t.err)