5915ac4ad4
This fix is an attempt to address https://github.com/docker/docker/pull/28213#issuecomment-273840405 Currently when specify table format with table `--format "table {{.ID}}..."`, the delimiter in the header section of the table is always `"\t"`. That is actually different from the content of the table as the delimiter could be anything (or even contatenated with `.`, for example): ``` $ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc NAME ID web.1.inyhxhvjcijl0hdbu8lgrwwh7 \_ web.1.p9m4kx2srjqmfms4igam0uqlb ``` This fix is an attampt to address the skewness of the table when delimiter is not `"\t"`. The basic idea is that, when header consists of `table` key, the header section will be redendered the same way as content section. A map mapping each placeholder name to the HEADER entry name is used for the context of the header. Unit tests have been updated and added to cover the changes. This fix is related to #28313. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: ea61dac9e6d04879445f9c34729055ac1bb15050 Component: engine
57 lines
1.7 KiB
Go
57 lines
1.7 KiB
Go
package formatter
|
|
|
|
import (
|
|
"bytes"
|
|
//"encoding/json"
|
|
//"strings"
|
|
"testing"
|
|
//"time"
|
|
|
|
//"github.com/docker/docker/api/types"
|
|
//"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/pkg/testutil/assert"
|
|
)
|
|
|
|
func TestDiskUsageContextFormatWrite(t *testing.T) {
|
|
// Check default output format (verbose and non-verbose mode) for table headers
|
|
cases := []struct {
|
|
context DiskUsageContext
|
|
expected string
|
|
}{
|
|
{
|
|
DiskUsageContext{Verbose: false},
|
|
`TYPE TOTAL ACTIVE SIZE RECLAIMABLE
|
|
Images 0 0 0B 0B
|
|
Containers 0 0 0B 0B
|
|
Local Volumes 0 0 0B 0B
|
|
`,
|
|
},
|
|
{
|
|
DiskUsageContext{Verbose: true},
|
|
`Images space usage:
|
|
|
|
REPOSITORY TAG IMAGE ID CREATED ago SIZE SHARED SIZE UNIQUE SiZE CONTAINERS
|
|
|
|
Containers space usage:
|
|
|
|
CONTAINER ID IMAGE COMMAND LOCAL VOLUMES SIZE CREATED ago STATUS NAMES
|
|
|
|
Local Volumes space usage:
|
|
|
|
VOLUME NAME LINKS SIZE
|
|
`,
|
|
},
|
|
}
|
|
|
|
for _, testcase := range cases {
|
|
//networks := []types.NetworkResource{
|
|
// {ID: "networkID1", Name: "foobar_baz", Driver: "foo", Scope: "local", Created: timestamp1},
|
|
// {ID: "networkID2", Name: "foobar_bar", Driver: "bar", Scope: "local", Created: timestamp2},
|
|
//}
|
|
out := bytes.NewBufferString("")
|
|
testcase.context.Output = out
|
|
testcase.context.Write()
|
|
assert.Equal(t, out.String(), testcase.expected)
|
|
}
|
|
}
|