mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4e7e3919ce
This fix tries to address the issue raised in 26300. Previously `docker images` will use `HumanSize()` to display the size which has a fixed precision of 4 (thus 3 fractional digits). This could be problematic in certain languages (e.g. , German, see 26300) as `.` may be interpreted as thousands-separator in number. This fix use `CustomSize()` instead and limit the precision to 3 (thus 2 fractional digits). This fix has been tested manually. This fix fixes 26300. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
45 lines
1.2 KiB
Go
45 lines
1.2 KiB
Go
package container
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
func TestDisplay(t *testing.T) {
|
|
c := &containerStats{
|
|
Name: "app",
|
|
CPUPercentage: 30.0,
|
|
Memory: 100 * 1024 * 1024.0,
|
|
MemoryLimit: 2048 * 1024 * 1024.0,
|
|
MemoryPercentage: 100.0 / 2048.0 * 100.0,
|
|
NetworkRx: 100 * 1024 * 1024,
|
|
NetworkTx: 800 * 1024 * 1024,
|
|
BlockRead: 100 * 1024 * 1024,
|
|
BlockWrite: 800 * 1024 * 1024,
|
|
PidsCurrent: 1,
|
|
}
|
|
var b bytes.Buffer
|
|
if err := c.Display(&b); err != nil {
|
|
t.Fatalf("c.Display() gave error: %s", err)
|
|
}
|
|
got := b.String()
|
|
want := "app\t30.00%\t100 MiB / 2 GiB\t4.88%\t105 MB / 839 MB\t105 MB / 839 MB\t1\n"
|
|
if got != want {
|
|
t.Fatalf("c.Display() = %q, want %q", got, want)
|
|
}
|
|
}
|
|
|
|
func TestCalculBlockIO(t *testing.T) {
|
|
blkio := types.BlkioStats{
|
|
IoServiceBytesRecursive: []types.BlkioStatEntry{{8, 0, "read", 1234}, {8, 1, "read", 4567}, {8, 0, "write", 123}, {8, 1, "write", 456}},
|
|
}
|
|
blkRead, blkWrite := calculateBlockIO(blkio)
|
|
if blkRead != 5801 {
|
|
t.Fatalf("blkRead = %d, want 5801", blkRead)
|
|
}
|
|
if blkWrite != 579 {
|
|
t.Fatalf("blkWrite = %d, want 579", blkWrite)
|
|
}
|
|
}
|