kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21149 from yongtang/21124-TestJSONFormatProgress

Browse source 
Fix flaky test TestJSONFormatProgress (#21124)
This commit is contained in:
David Calavera 2016-03-14 11:50:50 -07:00
commit c5aedcdac9
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/streamformatter/streamformatter_test.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"reflect"
"strings"
"testing"
"github.com/docker/docker/pkg/jsonmessage"
@ -84,9 +85,19 @@ func TestJSONFormatProgress(t *testing.T) {
if msg.Status != "action" {
t.Fatalf("Status must be 'action', got: %s", msg.Status)
}
if msg.ProgressMessage != progress.String() {
t.Fatalf("ProgressMessage must be %s, got: %s", progress.String(), msg.ProgressMessage)
// The progress will always be in the format of:
// [=========================> ] 15 B/30 B 404933h7m11s
// The last entry '404933h7m11s' is the timeLeftBox.
// However, the timeLeftBox field may change as progress.String() depends on time.Now().
// Therefore, we have to strip the timeLeftBox from the strings to do the comparison.
// Compare the progress strings before the timeLeftBox
expectedProgress := "[=========================> ] 15 B/30 B"
if !strings.HasPrefix(msg.ProgressMessage, expectedProgress) {
t.Fatalf("ProgressMessage without the timeLeftBox must be %s, got: %s", expectedProgress, msg.ProgressMessage)
}
if !reflect.DeepEqual(msg.Progress, progress) {
t.Fatal("Original progress not equals progress from FormatProgress")
}