← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/model/configcommand_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/model/configcommand_test.go
164
164
func (s *ConfigCommandSuite) TestBlockedError(c *gc.C) {
165
165
        s.fake.err = common.OperationBlockedError("TestBlockedError")
166
166
        _, err := s.run(c, "special=extra")
167
 
        c.Assert(err, gc.Equals, cmd.ErrSilent)
168
 
        // msg is logged
169
 
        c.Check(c.GetTestLog(), jc.Contains, "TestBlockedError")
 
167
        testing.AssertOperationWasBlocked(c, err, ".*TestBlockedError.*")
170
168
}
171
169
 
172
170
func (s *ConfigCommandSuite) TestResetPassesValues(c *gc.C) {
187
185
func (s *ConfigCommandSuite) TestResetBlockedError(c *gc.C) {
188
186
        s.fake.err = common.OperationBlockedError("TestBlockedError")
189
187
        _, err := s.run(c, "--reset", "special")
190
 
        c.Assert(err, gc.Equals, cmd.ErrSilent)
191
 
        // msg is logged
192
 
        c.Check(c.GetTestLog(), jc.Contains, "TestBlockedError")
 
188
        testing.AssertOperationWasBlocked(c, err, ".*TestBlockedError.*")
193
189
}