github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

add log test cases for Time encode

Browse Source 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
This commit is contained in:
pacoxu 2021-04-01 20:55:22 +08:00
parent 54bc0ff250
commit a1356f5218
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/component-base/logs/json/json_test.go
View File

@ -103,12 +103,12 @@ func TestZapLoggerV(t *testing.T) {
var buffer bytes.Buffer var buffer bytes.Buffer
writer := bufio.NewWriter(&buffer) writer := bufio.NewWriter(&buffer)
var sampleInfoLogger = NewJSONLogger(zapcore.AddSync(writer)) var sampleInfoLogger = NewJSONLogger(zapcore.AddSync(writer))
sampleInfoLogger.V(i).Info("test", "ns", "default", "podnum", 2) sampleInfoLogger.V(i).Info("test", "ns", "default", "podnum", 2, "time", time.Microsecond)
writer.Flush() writer.Flush()
logStr := buffer.String() logStr := buffer.String()
var v int var v int
var expectFormat string var expectFormat string
expectFormat = "{\"ts\":0.000123,\"msg\":\"test\",\"v\":%d,\"ns\":\"default\",\"podnum\":2}\n" expectFormat = "{\"ts\":0.000123,\"msg\":\"test\",\"v\":%d,\"ns\":\"default\",\"podnum\":2,\"time\":\"1µs\"}\n"
n, err := fmt.Sscanf(logStr, expectFormat, &v) n, err := fmt.Sscanf(logStr, expectFormat, &v)
if n != 1 || err != nil { if n != 1 || err != nil {
t.Errorf("log format error: %d elements, error %s:\n%s", n, err, logStr) t.Errorf("log format error: %d elements, error %s:\n%s", n, err, logStr)
@ -132,11 +132,11 @@ func TestZapLoggerError(t *testing.T) {
return time.Date(1970, time.January, 1, 0, 0, 0, 123, time.UTC) return time.Date(1970, time.January, 1, 0, 0, 0, 123, time.UTC)
} }
var sampleInfoLogger = NewJSONLogger(zapcore.AddSync(writer)) var sampleInfoLogger = NewJSONLogger(zapcore.AddSync(writer))
sampleInfoLogger.Error(fmt.Errorf("ivailid namespace:%s", "default"), "wrong namespace", "ns", "default", "podnum", 2) sampleInfoLogger.Error(fmt.Errorf("ivailid namespace:%s", "default"), "wrong namespace", "ns", "default", "podnum", 2, "time", time.Microsecond)
writer.Flush() writer.Flush()
logStr := buffer.String() logStr := buffer.String()
var ts float64 var ts float64
expectFormat := `{"ts":%f,"msg":"wrong namespace","v":0,"ns":"default","podnum":2,"err":"ivailid namespace:default"}` expectFormat := `{"ts":%f,"msg":"wrong namespace","v":0,"ns":"default","podnum":2,"time":"1µs","err":"ivailid namespace:default"}`
n, err := fmt.Sscanf(logStr, expectFormat, &ts) n, err := fmt.Sscanf(logStr, expectFormat, &ts)
if n != 1 || err != nil { if n != 1 || err != nil {
t.Errorf("log format error: %d elements, error %s:\n%s", n, err, logStr) t.Errorf("log format error: %d elements, error %s:\n%s", n, err, logStr)
@ -165,7 +165,7 @@ func TestKlogV(t *testing.T) {
t.Fatalf("Failed to set verbosity") t.Fatalf("Failed to set verbosity")
} }
for j := 0; j < 11; j++ { for j := 0; j < 11; j++ {
klog.V(klog.Level(j)).Info("test") klog.V(klog.Level(j)).Info("test", "time", time.Microsecond)
logWritten := buffer.writeCount > 0 logWritten := buffer.writeCount > 0
totalLogsWritten += buffer.writeCount totalLogsWritten += buffer.writeCount
buffer.writeCount = 0 buffer.writeCount = 0