← Back to branch summary

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

« back to all changes in this revision

Viewing changes to environs/jujutest/tests.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/jujutest/tests.go
10
10
        "launchpad.net/juju-core/juju/testing"
11
11
        "launchpad.net/juju-core/state"
12
12
        coretesting "launchpad.net/juju-core/testing"
13
 
        "launchpad.net/juju-core/trivial"
 
13
        "launchpad.net/juju-core/utils"
14
14
        "net/http"
15
15
        "sort"
16
16
)
150
150
        c.Assert(err, NotNil)
151
151
}
152
152
 
153
 
var noRetry = trivial.AttemptStrategy{}
 
153
var noRetry = utils.AttemptStrategy{}
154
154
 
155
155
func (t *Tests) TestPersistence(c *C) {
156
156
        storage := t.Open(c).Storage()
219
219
        c.Assert(err, IsNil)
220
220
}
221
221
 
222
 
func checkFileDoesNotExist(c *C, storage environs.StorageReader, name string, attempt trivial.AttemptStrategy) {
 
222
func checkFileDoesNotExist(c *C, storage environs.StorageReader, name string, attempt utils.AttemptStrategy) {
223
223
        var r io.ReadCloser
224
224
        var err error
225
225
        for a := attempt.Start(); a.Next(); {
233
233
        c.Assert(err, FitsTypeOf, notFoundError)
234
234
}
235
235
 
236
 
func checkFileHasContents(c *C, storage environs.StorageReader, name string, contents []byte, attempt trivial.AttemptStrategy) {
 
236
func checkFileHasContents(c *C, storage environs.StorageReader, name string, contents []byte, attempt utils.AttemptStrategy) {
237
237
        r, err := storage.Get(name)
238
238
        c.Assert(err, IsNil)
239
239
        c.Check(r, NotNil)