airship/airshipctl
Code Issues Proposed changes

Merge "Simplify ShowProgress unit test"

Browse Source
This commit is contained in:
Zuul 2020-10-22 13:49:38 +00:00 committed by Gerrit Code Review
commit cb9396bc80
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/bootstrap/isogen/command_test.go
View File

@ -19,7 +19,6 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"regexp"
"strings" "strings"
"testing" "testing"
@ -276,10 +275,6 @@ func TestShowProgress(t *testing.T) {
writer := bytes.NewBuffer(nil) writer := bytes.NewBuffer(nil)
err = showProgress(reader, writer) err = showProgress(reader, writer)
require.NoError(t, err) require.NoError(t, err)
expected, err := ioutil.ReadFile(tt.output) assert.Contains(t, writer.String(), "Completed")
require.NoError(t, err)
space := regexp.MustCompile(`\s+`)
assert.Equal(t, space.ReplaceAllString(string(expected), " "),
space.ReplaceAllString(writer.String(), " "))
} }
} }

4
pkg/bootstrap/isogen/testdata/pb-output-debian vendored
View File

@ -1,4 +0,0 @@
Retrieving base packages ... Done
Completed [----------------------------] 100.00%
Completed [----------------------------] 100.00%
Creating 4.0 filesystem on /root/LIVE_BOOT/image/live/filesystem.squashfs, block size 131072.