← 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/retryprovisioning_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/retryprovisioning_test.go
6
6
import (
7
7
        "strings"
8
8
 
9
 
        "github.com/juju/cmd"
10
9
        "github.com/juju/errors"
11
10
        jc "github.com/juju/testing/checkers"
12
11
        gc "gopkg.in/check.v1"
152
151
                        c.Check(err, gc.ErrorMatches, t.err)
153
152
                        continue
154
153
                }
155
 
                c.Assert(err, gc.ErrorMatches, cmd.ErrSilent.Error())
156
 
                // msg is logged
157
 
                stripped := strings.Replace(c.GetTestLog(), "\n", "", -1)
158
 
                c.Check(stripped, gc.Matches, ".*TestBlockRetryProvisioning.*")
 
154
                testing.AssertOperationWasBlocked(c, err, ".*TestBlockRetryProvisioning.*")
159
155
        }
160
156
}