From 14b5e843b7053dc7fc68ffa2e87fd635b810478d Mon Sep 17 00:00:00 2001 From: Thomas Gosteli Date: Fri, 13 Dec 2024 15:52:51 +0100 Subject: [PATCH] fix(e2e): ignore error log about failed storage update --- tests/e2e/logging_test.go | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/e2e/logging_test.go b/tests/e2e/logging_test.go index 3411983903c..d267ddda7b0 100644 --- a/tests/e2e/logging_test.go +++ b/tests/e2e/logging_test.go @@ -37,7 +37,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) { e2e.WithClusterSize(1), e2e.WithLogLevel("debug"), }, - allowedErrors: map[string]bool{"setting up serving from embedded etcd failed.": true}, + allowedErrors: map[string]bool{ + "setting up serving from embedded etcd failed.": true, + }, }, { name: "three node cluster", @@ -45,7 +47,12 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) { e2e.WithClusterSize(3), e2e.WithLogLevel("debug"), }, - allowedErrors: map[string]bool{"setting up serving from embedded etcd failed.": true}, + allowedErrors: map[string]bool{ + "setting up serving from embedded etcd failed.": true, + // See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800 + // TODO: Remove with etcd 3.7 + "failed to update storage version": true, + }, }, { name: "three node cluster with auto tls (all)", @@ -57,7 +64,12 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) { e2e.WithClientAutoTLS(true), e2e.WithClientConnType(e2e.ClientTLS), }, - allowedErrors: map[string]bool{"setting up serving from embedded etcd failed.": true}, + allowedErrors: map[string]bool{ + "setting up serving from embedded etcd failed.": true, + // See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800 + // TODO: Remove with etcd 3.7 + "failed to update storage version": true, + }, }, { name: "three node cluster with auto tls (peers)", @@ -67,7 +79,12 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) { e2e.WithIsPeerTLS(true), e2e.WithIsPeerAutoTLS(true), }, - allowedErrors: map[string]bool{"setting up serving from embedded etcd failed.": true}, + allowedErrors: map[string]bool{ + "setting up serving from embedded etcd failed.": true, + // See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800 + // TODO: Remove with etcd 3.7 + "failed to update storage version": true, + }, }, { name: "three node cluster with auto tls (client)", @@ -77,7 +94,12 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) { e2e.WithClientAutoTLS(true), e2e.WithClientConnType(e2e.ClientTLS), }, - allowedErrors: map[string]bool{"setting up serving from embedded etcd failed.": true}, + allowedErrors: map[string]bool{ + "setting up serving from embedded etcd failed.": true, + // See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800 + // TODO: Remove with etcd 3.7 + "failed to update storage version": true, + }, }, }