From ba059cb3116f72f7c338d9217ea8800efaec3618 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 22 Oct 2016 21:03:07 -0400 Subject: [PATCH] UPSTREAM: 32593: Audit test fails to take into account timezone --- vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit_test.go b/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit_test.go index 7fea8963b957..d18fb76e21d4 100644 --- a/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit_test.go +++ b/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit_test.go @@ -95,14 +95,14 @@ func TestAudit(t *testing.T) { if len(line) != 2 { t.Fatalf("Unexpected amount of lines in audit log: %d", len(line)) } - match, err := regexp.MatchString(`[\d\:\-\.\+]+ AUDIT: id="[\w-]+" ip="127.0.0.1" method="GET" user="admin" as="" asgroups="" namespace="default" uri="/api/v1/namespaces/default/pods"`, line[0]) + match, err := regexp.MatchString(`[\d\:\-\.\+TZ]+ AUDIT: id="[\w-]+" ip="127.0.0.1" method="GET" user="admin" as="" asgroups="" namespace="default" uri="/api/v1/namespaces/default/pods"`, line[0]) if err != nil { t.Errorf("Unexpected error matching first line: %v", err) } if !match { t.Errorf("Unexpected first line of audit: %s", line[0]) } - match, err = regexp.MatchString(`[\d\:\-\.\+]+ AUDIT: id="[\w-]+" response="200"`, line[1]) + match, err = regexp.MatchString(`[\d\:\-\.\+TZ]+ AUDIT: id="[\w-]+" response="200"`, line[1]) if err != nil { t.Errorf("Unexpected error matching second line: %v", err) }