vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Fix flaky test TestJSONFormatProgress (#21124)

Browse source 
In TestJSONFormatProgress, the progress string was used for comparison.
However, the progress string (progress.String()) uses time.Now().UTC()
to generate the timeLeftBox which is not a fixed value and cannot be
compared reliably.

This PR fixes the issue by stripping the timeLeftBox field before doing
the comparison.

This PR fixes #21124.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-03-12 05:50:02 +00:00
parent dcb61a1e38
commit 5478d6190e
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
streamformatter/streamformatter_test.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"reflect" "reflect"
"strings"
"testing" "testing"
"github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/jsonmessage"
@ -84,9 +85,19 @@ func TestJSONFormatProgress(t *testing.T) {
if msg.Status != "action" { if msg.Status != "action" {
t.Fatalf("Status must be 'action', got: %s", msg.Status) 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) { if !reflect.DeepEqual(msg.Progress, progress) {
t.Fatal("Original progress not equals progress from FormatProgress") t.Fatal("Original progress not equals progress from FormatProgress")
} }