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 #33653 from raja-sami-10p/pkg/streamformatter

Browse source 
Increase the Coverage of pkg/streamformatter
This commit is contained in:
Brian Goff 2017-06-22 19:52:02 -07:00 committed by GitHub
commit db57b85fcb
1 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkg/streamformatter/streamformatter_test.go
View file

@ -1,6 +1,7 @@
package streamformatter package streamformatter
import ( import (
"bytes"
"encoding/json" "encoding/json"
"errors" "errors"
"strings" "strings"
@ -19,12 +20,12 @@ func TestRawProgressFormatterFormatStatus(t *testing.T) {
func TestRawProgressFormatterFormatProgress(t *testing.T) { func TestRawProgressFormatterFormatProgress(t *testing.T) {
sf := rawProgressFormatter{} sf := rawProgressFormatter{}
progress := &jsonmessage.JSONProgress{ jsonProgress := &jsonmessage.JSONProgress{
Current: 15, Current: 15,
Total: 30, Total: 30,
Start: 1, Start: 1,
} }
res := sf.formatProgress("id", "action", progress, nil) res := sf.formatProgress("id", "action", jsonProgress, nil)
out := string(res) out := string(res)
assert.True(t, strings.HasPrefix(out, "action [====")) assert.True(t, strings.HasPrefix(out, "action [===="))
assert.Contains(t, out, "15B/30B") assert.Contains(t, out, "15B/30B")
@ -52,24 +53,25 @@ func TestFormatJSONError(t *testing.T) {
func TestJsonProgressFormatterFormatProgress(t *testing.T) { func TestJsonProgressFormatterFormatProgress(t *testing.T) {
sf := &jsonProgressFormatter{} sf := &jsonProgressFormatter{}
progress := &jsonmessage.JSONProgress{ jsonProgress := &jsonmessage.JSONProgress{
Current: 15, Current: 15,
Total: 30, Total: 30,
Start: 1, Start: 1,
} }
res := sf.formatProgress("id", "action", progress, nil) res := sf.formatProgress("id", "action", jsonProgress, &AuxFormatter{Writer: &bytes.Buffer{}})
msg := &jsonmessage.JSONMessage{} msg := &jsonmessage.JSONMessage{}
require.NoError(t, json.Unmarshal(res, msg)) require.NoError(t, json.Unmarshal(res, msg))
assert.Equal(t, "id", msg.ID) assert.Equal(t, "id", msg.ID)
assert.Equal(t, "action", msg.Status) assert.Equal(t, "action", msg.Status)
// The progress will always be in the format of: // jsonProgress will always be in the format of:
// [=========================> ] 15B/30B 412910h51m30s // [=========================> ] 15B/30B 412910h51m30s
// The last entry '404933h7m11s' is the timeLeftBox. // The last entry '404933h7m11s' is the timeLeftBox.
// However, the timeLeftBox field may change as progress.String() depends on time.Now(). // However, the timeLeftBox field may change as jsonProgress.String() depends on time.Now().
// Therefore, we have to strip the timeLeftBox from the strings to do the comparison. // Therefore, we have to strip the timeLeftBox from the strings to do the comparison.
// Compare the progress strings before the timeLeftBox // Compare the jsonProgress strings before the timeLeftBox
expectedProgress := "[=========================> ] 15B/30B" expectedProgress := "[=========================> ] 15B/30B"
// if terminal column is <= 110, expectedProgressShort is expected. // if terminal column is <= 110, expectedProgressShort is expected.
expectedProgressShort := " 15B/30B" expectedProgressShort := " 15B/30B"
@ -79,5 +81,29 @@ func TestJsonProgressFormatterFormatProgress(t *testing.T) {
expectedProgress, expectedProgressShort, msg.ProgressMessage) expectedProgress, expectedProgressShort, msg.ProgressMessage)
} }
assert.Equal(t, progress, msg.Progress) assert.Equal(t, jsonProgress, msg.Progress)
}
func TestJsonProgressFormatterFormatStatus(t *testing.T) {
sf := jsonProgressFormatter{}
res := sf.formatStatus("ID", "%s%d", "a", 1)
assert.Equal(t, `{"status":"a1","id":"ID"}`+streamNewline, string(res))
}
func TestNewJSONProgressOutput(t *testing.T) {
b := bytes.Buffer{}
b.Write(FormatStatus("id", "Downloading"))
_ = NewJSONProgressOutput(&b, false)
assert.Equal(t, `{"status":"Downloading","id":"id"}`+streamNewline, b.String())
}
func TestAuxFormatterEmit(t *testing.T) {
b := bytes.Buffer{}
aux := &AuxFormatter{Writer: &b}
sampleAux := &struct {
Data string
}{"Additional data"}
err := aux.Emit(sampleAux)
require.NoError(t, err)
assert.Equal(t, `{"aux":{"Data":"Additional data"}}`+streamNewline, b.String())
} }