Reverted unnecessary changes.

zhatin · Feb 26, 2015 · 68b4ff9 · 68b4ff9
1 parent 280a41f
commit 68b4ff9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/apiserver/common/block_test.go b/apiserver/common/block_test.go
@@ -44,7 +44,6 @@ func (s *blockCheckerSuite) SetUpTest(c *gc.C) {
 	s.remove = mockBlock{t: state.RemoveBlock, m: "Mock BLOCK testing: REMOVE"}
 	s.change = mockBlock{t: state.ChangeBlock, m: "Mock BLOCK testing: CHANGE"}
 	s.blockchecker = common.NewBlockChecker(s)
-	s.AddCleanup(func(*gc.C) { s.BlockHelper.Close() })
 }
 
 func (mock *blockCheckerSuite) GetBlockForType(t state.BlockType) (state.Block, bool, error) {

diff --git a/juju/testing/conn.go b/juju/testing/conn.go
@@ -590,3 +590,10 @@ func (s *JujuConnSuite) AgentConfigForTag(c *gc.C, tag names.Tag) agent.ConfigSe
 	c.Assert(err, jc.ErrorIsNil)
 	return config
 }
+
+// AssertConfigParameterUpdated updates environment parameter and
+// asserts that no errors were encountered
+func (s *JujuConnSuite) AssertConfigParameterUpdated(c *gc.C, key string, value interface{}) {
+	err := s.BackingState.UpdateEnvironConfig(map[string]interface{}{key: value}, nil, nil)
+	c.Assert(err, jc.ErrorIsNil)
+}