Skip to content

Commit 3388e2b

Browse files
authored
Merge pull request #19146 from AwesomePatrol/revert-19069-to-reduce-flakiness
Revert "Update the allowedErrors" to reduce e2e test flakiness
2 parents 00e5b65 + d5231c7 commit 3388e2b

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

tests/e2e/logging_test.go

+15
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) {
3939
},
4040
allowedErrors: map[string]bool{
4141
"setting up serving from embedded etcd failed.": true,
42+
// See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800
43+
// TODO: Remove with etcd 3.7
44+
"cannot detect storage schema version: missing confstate information": true,
4245
},
4346
},
4447
{
@@ -49,6 +52,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) {
4952
},
5053
allowedErrors: map[string]bool{
5154
"setting up serving from embedded etcd failed.": true,
55+
// See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800
56+
// TODO: Remove with etcd 3.7
57+
"cannot detect storage schema version: missing confstate information": true,
5258
},
5359
},
5460
{
@@ -63,6 +69,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) {
6369
},
6470
allowedErrors: map[string]bool{
6571
"setting up serving from embedded etcd failed.": true,
72+
// See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800
73+
// TODO: Remove with etcd 3.7
74+
"cannot detect storage schema version: missing confstate information": true,
6675
},
6776
},
6877
{
@@ -75,6 +84,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) {
7584
},
7685
allowedErrors: map[string]bool{
7786
"setting up serving from embedded etcd failed.": true,
87+
// See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800
88+
// TODO: Remove with etcd 3.7
89+
"cannot detect storage schema version: missing confstate information": true,
7890
},
7991
},
8092
{
@@ -87,6 +99,9 @@ func TestNoErrorLogsDuringNormalOperations(t *testing.T) {
8799
},
88100
allowedErrors: map[string]bool{
89101
"setting up serving from embedded etcd failed.": true,
102+
// See https://github.com/etcd-io/etcd/pull/19040#issuecomment-2539173800
103+
// TODO: Remove with etcd 3.7
104+
"cannot detect storage schema version: missing confstate information": true,
90105
},
91106
},
92107
}

0 commit comments

Comments
 (0)