From 8dd6b83d46c70d6607758cb46c3b33e43118a358 Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Tue, 23 Sep 2014 17:55:14 +0400 Subject: [PATCH 1/2] Benchmark for jsonlog.WriteLog Signed-off-by: Alexandr Morozov Upstream-commit: 81c9927f8f3c190ed9dd15b62716a240ce20fc51 Component: engine --- components/engine/pkg/jsonlog/jsonlog_test.go | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 components/engine/pkg/jsonlog/jsonlog_test.go diff --git a/components/engine/pkg/jsonlog/jsonlog_test.go b/components/engine/pkg/jsonlog/jsonlog_test.go new file mode 100644 index 0000000000..13b8dbea5b --- /dev/null +++ b/components/engine/pkg/jsonlog/jsonlog_test.go @@ -0,0 +1,33 @@ +package jsonlog + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "testing" + "time" + + "github.com/docker/docker/pkg/timeutils" +) + +func BenchmarkWriteLog(b *testing.B) { + var buf bytes.Buffer + e := json.NewEncoder(&buf) + testLine := "Line that thinks that it is log line from docker\n" + for i := 0; i < 30; i++ { + e.Encode(JSONLog{Log: testLine, Stream: "stdout", Created: time.Now()}) + } + r := bytes.NewReader(buf.Bytes()) + w := ioutil.Discard + format := timeutils.RFC3339NanoFixed + b.SetBytes(int64(r.Len())) + b.ResetTimer() + for i := 0; i < b.N; i++ { + if err := WriteLog(r, w, format); err != nil { + b.Fatal(err) + } + b.StopTimer() + r.Seek(0, 0) + b.StartTimer() + } +} From a6c06e4ad82276c5243a8064911af8796b57fd08 Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Tue, 23 Sep 2014 18:19:06 +0400 Subject: [PATCH 2/2] Test for jsonlog.WriteLog Signed-off-by: Alexandr Morozov Upstream-commit: 2add198a7abc084dd394f61ed26057ec5d639a4c Component: engine --- components/engine/pkg/jsonlog/jsonlog_test.go | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/components/engine/pkg/jsonlog/jsonlog_test.go b/components/engine/pkg/jsonlog/jsonlog_test.go index 13b8dbea5b..5ee5eda35c 100644 --- a/components/engine/pkg/jsonlog/jsonlog_test.go +++ b/components/engine/pkg/jsonlog/jsonlog_test.go @@ -4,12 +4,40 @@ import ( "bytes" "encoding/json" "io/ioutil" + "regexp" + "strings" "testing" "time" "github.com/docker/docker/pkg/timeutils" ) +func TestWriteLog(t *testing.T) { + var buf bytes.Buffer + e := json.NewEncoder(&buf) + testLine := "Line that thinks that it is log line from docker\n" + for i := 0; i < 30; i++ { + e.Encode(JSONLog{Log: testLine, Stream: "stdout", Created: time.Now()}) + } + w := bytes.NewBuffer(nil) + format := timeutils.RFC3339NanoFixed + if err := WriteLog(&buf, w, format); err != nil { + t.Fatal(err) + } + res := w.String() + t.Logf("Result of WriteLog: %q", res) + lines := strings.Split(strings.TrimSpace(res), "\n") + if len(lines) != 30 { + t.Fatalf("Must be 30 lines but got %d", len(lines)) + } + logRe := regexp.MustCompile(`\[.*\] Line that thinks that it is log line from docker`) + for _, l := range lines { + if !logRe.MatchString(l) { + t.Fatalf("Log line not in expected format: %q", l) + } + } +} + func BenchmarkWriteLog(b *testing.B) { var buf bytes.Buffer e := json.NewEncoder(&buf)