← 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/defaultscommand_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/defaultscommand_test.go
115
115
func (s *DefaultsCommandSuite) TestResetBlockedError(c *gc.C) {
116
116
        s.fake.err = common.OperationBlockedError("TestBlockedError")
117
117
        _, err := s.run(c, "--reset", "attr")
118
 
        c.Assert(err, gc.Equals, cmd.ErrSilent)
119
 
        // msg is logged
120
 
        c.Check(c.GetTestLog(), jc.Contains, "TestBlockedError")
 
118
        testing.AssertOperationWasBlocked(c, err, ".*TestBlockedError.*")
121
119
}
122
120
 
123
121
func (s *DefaultsCommandSuite) TestSetUnknownValueLogs(c *gc.C) {
143
141
func (s *DefaultsCommandSuite) TestBlockedErrorOnSet(c *gc.C) {
144
142
        s.fake.err = common.OperationBlockedError("TestBlockedError")
145
143
        _, err := s.run(c, "special=extra")
146
 
        c.Assert(err, gc.Equals, cmd.ErrSilent)
147
 
        // msg is logged
148
 
        c.Check(c.GetTestLog(), jc.Contains, "TestBlockedError")
 
144
        testing.AssertOperationWasBlocked(c, err, ".*TestBlockedError.*")
149
145
}
150
146
 
151
147
func (s *DefaultsCommandSuite) TestGetSingleValue(c *gc.C) {