Skip to content

Commit 1720d4a

Browse files
authored
Give more time to multiline parser to aggregate logs into events during testing (#30335)
1 parent 89d0f21 commit 1720d4a

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

filebeat/input/filestream/parsers_integration_test.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ The total should be 4 lines covered
248248

249249
// test_rabbitmq_multiline_log from test_multiline.py
250250
func TestParsersRabbitMQMultilineLog(t *testing.T) {
251-
t.Skip("Flaky test: https://github.com/elastic/beats/issues/27893")
252-
253251
env := newInputTestingEnvironment(t)
254252

255253
testlogName := "test.log"
@@ -263,7 +261,7 @@ func TestParsersRabbitMQMultilineLog(t *testing.T) {
263261
"pattern": "^=[A-Z]+",
264262
"negate": true,
265263
"match": "after",
266-
"timeout": "100ms", // set to lower value to speed up test
264+
"timeout": "3s", // set to lower value to speed up test
267265
},
268266
},
269267
},
@@ -294,8 +292,6 @@ connection <0.23893.109>, channel 3 - soft error:
294292

295293
// test_max_lines from test_multiline.py
296294
func TestParsersMultilineMaxLines(t *testing.T) {
297-
t.Skip("Flaky test: https://github.com/elastic/beats/issues/27894")
298-
299295
env := newInputTestingEnvironment(t)
300296

301297
testlogName := "test.log"
@@ -310,7 +306,7 @@ func TestParsersMultilineMaxLines(t *testing.T) {
310306
"negate": true,
311307
"match": "after",
312308
"max_lines": 3,
313-
"timeout": "100ms", // set to lower value to speed up test
309+
"timeout": "3s", // set to lower value to speed up test
314310
},
315311
},
316312
},
@@ -402,7 +398,6 @@ func TestParsersMultilineTimeout(t *testing.T) {
402398

403399
// test_max_bytes from test_multiline.py
404400
func TestParsersMultilineMaxBytes(t *testing.T) {
405-
t.Skip("Flaky test https://github.com/elastic/beats/issues/28088")
406401
env := newInputTestingEnvironment(t)
407402

408403
testlogName := "test.log"
@@ -417,7 +412,7 @@ func TestParsersMultilineMaxBytes(t *testing.T) {
417412
"pattern": "^\\[",
418413
"negate": true,
419414
"match": "after",
420-
"timeout": "100ms", // set to lower value to speed up test
415+
"timeout": "3s", // set to lower value to speed up test
421416
},
422417
},
423418
},
@@ -450,7 +445,7 @@ func TestParsersCloseTimeoutWithMultiline(t *testing.T) {
450445
inp := env.mustCreateInput(map[string]interface{}{
451446
"paths": []string{env.abspath(testlogName)},
452447
"prospector.scanner.check_interval": "1ms",
453-
"close.reader.after_interval": "100ms",
448+
"close.reader.after_interval": "1s",
454449
"parsers": []map[string]interface{}{
455450
map[string]interface{}{
456451
"multiline": map[string]interface{}{
@@ -507,22 +502,22 @@ func TestParsersCloseTimeoutWithMultiline(t *testing.T) {
507502

508503
// test_consecutive_newline from test_multiline.py
509504
func TestParsersConsecutiveNewline(t *testing.T) {
510-
t.Skip("Flaky test: https://github.com/elastic/beats/issues/27085")
511505

512506
env := newInputTestingEnvironment(t)
513507

514508
testlogName := "test.log"
515509
inp := env.mustCreateInput(map[string]interface{}{
516510
"paths": []string{env.abspath(testlogName)},
517511
"prospector.scanner.check_interval": "1ms",
512+
"close.reader.after_interval": "1s",
518513
"parsers": []map[string]interface{}{
519514
map[string]interface{}{
520515
"multiline": map[string]interface{}{
521516
"type": "pattern",
522517
"pattern": "^\\[",
523518
"negate": true,
524519
"match": "after",
525-
"timeout": "100ms", // set to lower value to speed up test
520+
"timeout": "3s", // set to lower value to speed up test
526521
},
527522
},
528523
},

0 commit comments

Comments
 (0)