Fix tests for go1.6
Vladimir Bauer
9 years ago
| 4 | 4 | "fmt" |
| 5 | 5 | "io" |
| 6 | 6 | "io/ioutil" |
| 7 | "regexp" | |
| 7 | 8 | "strings" |
| 8 | 9 | "testing" |
| 9 | 10 | "time" |
| 281 | 282 | |
| 282 | 283 | p.Stop() |
| 283 | 284 | |
| 284 | want := "0s[" | |
| 285 | barOut := buf.String() | |
| 286 | if !strings.Contains(barOut, want) { | |
| 285 | want := `0s?\[` | |
| 286 | barOut := buf.String() | |
| 287 | ||
| 288 | matched, err := regexp.MatchString(want, barOut) | |
| 289 | if err != nil { | |
| 290 | t.Logf("Regex %q err: %+v\n", want, err) | |
| 291 | t.FailNow() | |
| 292 | } | |
| 293 | ||
| 294 | if !matched { | |
| 287 | 295 | t.Errorf("%q not found in bar: %s\n", want, barOut) |
| 288 | 296 | } |
| 289 | 297 | } |
| 302 | 310 | |
| 303 | 311 | p.Stop() |
| 304 | 312 | |
| 305 | want := "0s [" | |
| 306 | barOut := buf.String() | |
| 307 | if !strings.Contains(barOut, want) { | |
| 313 | want := `0s? \[` | |
| 314 | barOut := buf.String() | |
| 315 | ||
| 316 | matched, err := regexp.MatchString(want, barOut) | |
| 317 | if err != nil { | |
| 318 | t.Logf("Regex %q err: %+v\n", want, err) | |
| 319 | t.FailNow() | |
| 320 | } | |
| 321 | ||
| 322 | if !matched { | |
| 308 | 323 | t.Errorf("%q not found in bar: %s\n", want, barOut) |
| 309 | 324 | } |
| 310 | 325 | } |
| 323 | 338 | |
| 324 | 339 | p.Stop() |
| 325 | 340 | |
| 326 | want := "]0s" | |
| 327 | barOut := buf.String() | |
| 328 | if !strings.Contains(barOut, want) { | |
| 341 | want := `\]0s?` | |
| 342 | barOut := buf.String() | |
| 343 | ||
| 344 | matched, err := regexp.MatchString(want, barOut) | |
| 345 | if err != nil { | |
| 346 | t.Logf("Regex %q err: %+v\n", want, err) | |
| 347 | t.FailNow() | |
| 348 | } | |
| 349 | ||
| 350 | if !matched { | |
| 329 | 351 | t.Errorf("%q not found in bar: %s\n", want, barOut) |
| 330 | 352 | } |
| 331 | 353 | } |
| 344 | 366 | |
| 345 | 367 | p.Stop() |
| 346 | 368 | |
| 347 | want := "]0s " | |
| 348 | barOut := buf.String() | |
| 349 | if !strings.Contains(barOut, want) { | |
| 350 | t.Errorf("%q not found in bar: %s\n", want, barOut) | |
| 351 | } | |
| 352 | } | |
| 369 | want := `\]0s? ` | |
| 370 | barOut := buf.String() | |
| 371 | ||
| 372 | matched, err := regexp.MatchString(want, barOut) | |
| 373 | if err != nil { | |
| 374 | t.Logf("Regex %q err: %+v\n", want, err) | |
| 375 | t.FailNow() | |
| 376 | } | |
| 377 | ||
| 378 | if !matched { | |
| 379 | t.Errorf("%q not found in bar: %s\n", want, barOut) | |
| 380 | } | |
| 381 | } | |