Merge current v2.6 into master
This commit is contained in:
commit
3bf4a8fbe2
25 changed files with 102 additions and 36 deletions
|
@ -32,7 +32,7 @@ func (s *SimpleSuite) TestInvalidConfigShouldFail(c *check.C) {
|
|||
defer s.killCmd(cmd)
|
||||
|
||||
err = try.Do(500*time.Millisecond, func() error {
|
||||
expected := "Near line 0 (last key parsed ''): bare keys cannot contain '{'"
|
||||
expected := "expected '.' or '=', but got '{' instead"
|
||||
actual := output.String()
|
||||
|
||||
if !strings.Contains(actual, expected) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue