Merge lp:~axwalk/juju-core/lp1154942-fix-environs-test-teardown into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Reset dummy environ in teardown for config tests

https://codereview.appspot.com/11806043/

Reset dummy environ in teardown for config tests

https://codereview.appspot.com/11806043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+176834_code.launchpad.net,

Message:
Please take a look.

Description:
Reset dummy environ in teardown for config tests

https://code.launchpad.net/~axwalk/juju-core/lp1154942-fix-environs-test-teardown/+merge/176834

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/config_test.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-20130724165437-wt01mn3gqkwfrel0
+New revision: <email address hidden>

Index: environs/config_test.go
=== modified file 'environs/config_test.go'
--- environs/config_test.go 2013-07-09 10:32:23 +0000
+++ environs/config_test.go 2013-07-25 01:45:40 +0000
@@ -11,7 +11,7 @@

   "launchpad.net/juju-core/environs"
   "launchpad.net/juju-core/environs/config"
- _ "launchpad.net/juju-core/environs/dummy"
+ "launchpad.net/juju-core/environs/dummy"
   "launchpad.net/juju-core/testing"
  )

@@ -19,6 +19,10 @@

  var _ = Suite(suite{})

+func (suite) TearDownTest(c *C) {
+ dummy.Reset()
+}
+
  var invalidConfigTests = []struct {
   env string
   err string

[William Reade (fwereade)]

LGTM trivial, go ahead and merge

https://codereview.appspot.com/11806043/

=== modified file 'environs/config_test.go'
--- environs/config_test.go	2013-07-09 10:32:23 +0000
+++ environs/config_test.go	2013-07-25 01:50:36 +0000
@@ -11,7 +11,7 @@
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	_ "launchpad.net/juju-core/environs/dummy"
+	"launchpad.net/juju-core/environs/dummy"
 	"launchpad.net/juju-core/testing"
 )
 
@@ -19,6 +19,10 @@
 
 var _ = Suite(suite{})
 
+func (suite) TearDownTest(c *C) {
+	dummy.Reset()
+}
+
 var invalidConfigTests = []struct {
 	env string
 	err string