Merge lp://staging/~axwalk/juju-core/lp1154942-fix-environs-test-teardown into lp://staging/~go-bot/juju-core/trunk
Proposed by
Andrew Wilkins
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andrew Wilkins | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1540 | ||||
Proposed branch: | lp://staging/~axwalk/juju-core/lp1154942-fix-environs-test-teardown | ||||
Merge into: | lp://staging/~go-bot/juju-core/trunk | ||||
Diff against target: |
23 lines (+5/-1) 1 file modified
environs/config_test.go (+5/-1) |
||||
To merge this branch: | bzr merge lp://staging/~axwalk/juju-core/lp1154942-fix-environs-test-teardown | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+176834@code.staging.launchpad.net |
Commit message
Reset dummy environ in teardown for config tests
Description of the change
Reset dummy environ in teardown for config tests
To post a comment you must log in.
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: config_ test.go
A [revision details]
M environs/
Index: [revision details] 20130724165437- wt01mn3gqkwfrel 0
=== 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-
+New revision: <email address hidden>
Index: environs/ config_ test.go config_ test.go' config_ test.go 2013-07-09 10:32:23 +0000 config_ test.go 2013-07-25 01:45:40 +0000
=== modified file 'environs/
--- environs/
+++ environs/
@@ -11,7 +11,7 @@
"launchpad. net/juju- core/environs" net/juju- core/environs/ config" net/juju- core/environs/ dummy" net/juju- core/environs/ dummy" net/juju- core/testing"
"launchpad.
- _ "launchpad.
+ "launchpad.
"launchpad.
)
@@ -19,6 +19,10 @@
var _ = Suite(suite{})
+func (suite) TearDownTest(c *C) {
+ dummy.Reset()
+}
+
var invalidConfigTests = []struct {
env string
err string