add new canst to not to break existing test suits

Signed-off-by: Yuta Iwama <[email protected]>
fluent · Mar 3, 2020 · 50a10cb · 50a10cb
1 parent 7b09ffb
commit 50a10cb
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/test/plugin/test_in_tail.rb b/test/plugin/test_in_tail.rb
@@ -48,14 +48,29 @@ def cleanup_directory(path)
   MULTILINE_CONFIG = config_element(
     "", "", {
       "format" => "multiline",
-      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>.[^\\n]+))?/",
+      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>.*))?/",
       "format_firstline" => "/^[s]/"
     })
   PARSE_MULTILINE_CONFIG = config_element(
     "", "", {},
     [config_element("parse", "", {
                       "@type" => "multiline",
-                      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>[^\\n]+))?/",
+                      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>.*))?/",
+                      "format_firstline" => "/^[s]/"
+                    })
+    ])
+
+  MULTILINE_CONFIG_WITH_NEWLINE = config_element(
+    "", "", {
+      "format" => "multiline",
+      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>.[^\\n]+))?/",
+      "format_firstline" => "/^[s]/"
+    })
+  PARSE_MULTILINE_CONFIG_WITH_NEWLINE = config_element(
+    "", "", {},
+    [config_element("parse", "", {
+                      "@type" => "multiline",
+                      "format1" => "/^s (?<message1>[^\\n]+)(\\nf (?<message2>[^\\n]+))?(\\nf (?<message3>.[^\\n]+))?/",
                       "format_firstline" => "/^[s]/"
                     })
     ])
@@ -742,8 +757,8 @@ def test_multiline_with_emit_unmatched_lines_true(data)
     end
 
     data(
-      flat: MULTILINE_CONFIG,
-      parse: PARSE_MULTILINE_CONFIG)
+      flat: MULTILINE_CONFIG_WITH_NEWLINE,
+      parse: PARSE_MULTILINE_CONFIG_WITH_NEWLINE)
     def test_multiline_with_emit_unmatched_lines2(data)
       config = data + config_element("", "", { "emit_unmatched_lines" => true })
       File.open("#{TMP_DIR}/tail.txt", "wb") { |f| }