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

Fix pkg/streamformatter.TestJSONFormatProgress

Browse source 
The test was failing if the terminal column width is <= 110.

Addendum to #23113

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2016-05-31 09:09:06 +00:00
parent ed9647689d
commit dbb2000590
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
streamformatter/streamformatter_test.go
View file

@ -94,8 +94,12 @@ func TestJSONFormatProgress(t *testing.T) {
// Compare the progress strings before the timeLeftBox // Compare the progress strings before the timeLeftBox
expectedProgress := "[=========================> ] 15 B/30 B" expectedProgress := "[=========================> ] 15 B/30 B"
if !strings.HasPrefix(msg.ProgressMessage, expectedProgress) { // if terminal column is <= 110, expectedProgressShort is expected.
t.Fatalf("ProgressMessage without the timeLeftBox must be %s, got: %s", expectedProgress, msg.ProgressMessage) expectedProgressShort := " 15 B/30 B"
if !(strings.HasPrefix(msg.ProgressMessage, expectedProgress) ||
strings.HasPrefix(msg.ProgressMessage, expectedProgressShort)) {
t.Fatalf("ProgressMessage without the timeLeftBox must be %s or %s, got: %s",
expectedProgress, expectedProgressShort, msg.ProgressMessage)
} }
if !reflect.DeepEqual(msg.Progress, progress) { if !reflect.DeepEqual(msg.Progress, progress) {