Merge lp://staging/~rogpeppe/juju-core/393-1.14-fix-live-test into lp://staging/juju-core/1.14

Reviewers: mp+185474_code.launchpad.net,

Message:
Please take a look.

Description:
environs/jujutest: fix test for Prepare

This is a backport to 1.14 of a fix that is already in trunk.

https://code.launchpad.net/~rogpeppe/juju-core/393-1.14-fix-live-test/+merge/185474

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13251047/

Affected files (+5, -1 lines):
   A [revision details]
   M environs/jujutest/livetests.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130911073858-zypv9bm333hoy996
+New revision: <email address hidden>

Index: environs/jujutest/livetests.go
=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go 2013-09-11 06:27:05 +0000
+++ environs/jujutest/livetests.go 2013-09-13 11:47:04 +0000
@@ -828,7 +828,7 @@
   env, err := environs.New(cfg)
   c.Assert(err, IsNil)

- dummyenv, err := environs.NewFromAttrs(map[string]interface{}{
+ dummyCfg, err := config.New(map[string]interface{}{
    "type": "dummy",
    "name": "dummy storage",
    "secret": "pizza",
@@ -837,6 +837,8 @@
    "ca-private-key": coretesting.CAKey,
   })
   c.Assert(err, IsNil)
+ dummyenv, err := environs.Prepare(dummyCfg)
+ c.Assert(err, IsNil)
   defer dummyenv.Destroy(nil)

   // BUG: We destroy the environment, then write to its storage.

LGTM

https://codereview.appspot.com/13251047/