From 952893411e54e270bade862bf81eaf48a8667e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <kvch@users.noreply.github.com>
Date: Wed, 29 Jul 2020 14:02:47 +0200
Subject: [PATCH] Enable and fix Journalbeat integration tests (#20140)
 (#20154)

(cherry picked from commit 2025662bade8710705361aaa150e54dfc7e452bc)
---
 journalbeat/Makefile                         |   2 +-
 journalbeat/input/input.go                   |   4 +-
 journalbeat/tests/system/input/test.journal  | Bin 8388608 -> 8388608 bytes
 journalbeat/tests/system/input/test.registry |   6 +-
 journalbeat/tests/system/test_base.py        |  72 ++++---------------
 libbeat/tests/system/beat/beat.py            |  15 ++++
 6 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/journalbeat/Makefile b/journalbeat/Makefile
index 62bf3778d21..85049183d4e 100644
--- a/journalbeat/Makefile
+++ b/journalbeat/Makefile
@@ -1,6 +1,6 @@
 BEAT_NAME=journalbeat
 BEAT_TITLE=Journalbeat
-SYSTEM_TESTS=false
+SYSTEM_TESTS=true
 TEST_ENVIRONMENT=false
 ES_BEATS?=..
 
diff --git a/journalbeat/input/input.go b/journalbeat/input/input.go
index f8cbf1fbf73..b45b99d1816 100644
--- a/journalbeat/input/input.go
+++ b/journalbeat/input/input.go
@@ -79,7 +79,7 @@ func New(
 		state := states[cfg.CheckpointID]
 		r, err := reader.NewLocal(cfg, done, state, logger)
 		if err != nil {
-			return nil, fmt.Errorf("error creating reader for local journal: %v", err)
+			return nil, fmt.Errorf("error creating reader for local journal: %+v", err)
 		}
 		readers = append(readers, r)
 	}
@@ -99,7 +99,7 @@ func New(
 		state := states[cfg.CheckpointID]
 		r, err := reader.New(cfg, done, state, logger)
 		if err != nil {
-			return nil, fmt.Errorf("error creating reader for journal: %v", err)
+			return nil, fmt.Errorf("error creating reader for journal: %+v", err)
 		}
 		readers = append(readers, r)
 	}
diff --git a/journalbeat/tests/system/input/test.journal b/journalbeat/tests/system/input/test.journal
index 887d49179056bdc21618db72fa1d6ddd2653418b..c42b825e62dcb7e934e0dc17cc218e46de463a66 100644
GIT binary patch
delta 32275
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
K=+~rMt@!^*d%C&+

delta 4882
zcmeHKeQZ-z6mKb$!V~R;h5-VP8IZ_VxA(SHbjTQ$ma%oLMK(c8*S^w9X-hX?63JU2
zL=0$<g**+I3=DB35T_szOn@<9<9q%=z<{z22E>rq$)^Ow)82CycmW6KpElWk_nvp}
zx%d9gxxagFb#-<3YWS0<78f|I))K1*e%;_tn<&6<_t-0+&S)x}x~AtE<MSPDcW#Vd
zHK*s)NpG&$e<RjmI<aH*=w>m##Gbdc)qC^%-&fj~q~BXy+hiTRqEUB!i7WG5oVn2$
z?#szitC1O6>-4O^29h-`eOZ0QPwYb$t7@J@JT{gUnh*^KS-aFblQ;G$OVP-eT}k|S
z*8TWEXqt-sdLk0^!9ogRYjWJr|C(51&>FZAdzn|jnhxD5u6Q4-18$2M52kQu&;SUA
zQ##JPpS1u4!}4xiGr9l-L%WWvYGf?{w{_@Jw4D9`GXTOMn>c?1s{=y4ojZdr0ipgw
zO^Z>li`VIw#f&>+Ms3z8?u%yD0WdLUUv9z)W&li#`8H=jmw;ecyOyg*x&XoOPM{aA
zLz7&`rQy8}F%OzUiSL`*xoT_x2!`duxqW+B3qUX|n9tSW7=U0%DdJWiVJ!f`aB4iK
z$CU$uVR`{qj|M<o&5cs7_89912(5-~<IHFP1jCI_xCl}T2nORh&Wfu61Vj69&X1G<
zCJdZnXchFY_%X(9AHCdtR+DufRy$$B0lhNwmM};zv=`Z(_99!p%V{gLIGlNf#km=o
zCX-1Nv&~{wMq)=Ke)$YE=WnjN(-zO`j#Ulu?{e6um*iVqkMNglO1o+rcFY`dxZ$h6
za>kXCBSM&2vS@8$NV~x0EXgZ!6x&OjxpSpxND3-n#)MaOK#bBD6NZgTU4FHyZ{x}>
z<cE;_H6LaEXhFp#HhYQ9S(Ym*>21Pr8>I=^)e~-yo$i18+}#c2myrBd(|nbTKZSl;
zlj3fL=|K)DD_ey@#k9^?bJKSvyJ}ZacS3Tri`?J`N10=)eX`3o$x`IBy=}9U(CYOu
zf!9HjD<fg`@@i}zFJ1MGb-r~Oxg{j`8cZ-^0YdJ`n{3Ig^anz7BW|zD?TG}&@e4w8
zL*YdsJ`%2|2$TmUzS1v6=edKtJLrzi<HJ#YuJmDf*d6uq(n2Xz*^`e-9x1R;@+$Qg
z1YV}ZM)#eX8o>F?*togzc-7iMnjRrdGp=I6HPLQ&0tvaVn=-u~vmp9RIbP8xX1KkQ
zDO>bqmuE^obGhhaj+FC%2t#Gs8Pu5~8pP4ot@(1Ab4rhUG&mtmVgzbUX9gDL<y&n<
zmc%@KS%PHtWapS(7d@gVc+6%`rY}p%@MQ=lk5rxwz7+YIFjNNupnQEz$W0}$v&pN{
zaZPwjCS7n@?G9&AUZDkNp+jszB=INF9}vEr6nph4)OzyrgylaEOef7E0U#m4eOC(V
zm+(AGL;HqQkMf*!loFOSk1~wdrBIUM5v#B;W!+6sm@CKG#v=l%P;ZM5Gy84SP7047
zSG=@`68W~<GzV5Sv?A)yV?Rpe$0(4jmNbzDnu4D5t4n_?OK-&E8H}j^G*BrHM4Cqm
zk&6d4`HP~zyRW@Cc+~|XTb-u2MnlwrL*<Q^#KE$9v-#a2Z&32`)&ffz+fclzD%(_U
zVjk7G(2N&>`8sRz;9p$z=v?@<apsWw;eN~1v6s7w^%KN4IkW!$=<Jc*1A01?C}gCi
zoy=m$kr`P}Tgr@-Rh?vP5#{RKNW&ab_iK5kesCWf(ei8qRzG9EGY|Gl+y|d@g(kcd
zcEt=O;dW$ndha<iUkMM`j8zTXZj!~sxXJq{-8O0aJmw^b1SNNc1o9pUM=KM@0PhKh
zyn)I<I8?ze@=GDG1u8IU{q9Ia3PB=QhWSAGywQonWV9Dfh~R`^prW#3OhtG>)Fa8h
zaCD9|CL~oRrlij9!<gMQnBD6iliiCh3hx$QNK02|ch|}NKBM9vlq*TqlV&&FNr`f$
z-XNywfan^nc96oSifIKDZOY?1ytO9BfqxV|KN?cjpZz>-$o3udoi-R~Wf#}BY?F|a
zk&~q+^$3#M1K$b;d@HDrj~-+BQw`e7PBp2diFjJbTe@PIH18>ni{xU7bh=R!6A$lv
zWsgDZr2{rPDekO1eEt2g;j{IF3ilF^<Q3wO<gwrp*Hw1?Wjy9kU`X2or!)H$oxNR4
z4k`8thfgK#8O(z^PDe3L62@uXW8yS&sp;wq)=N$5IQ{3+u9k9op|l~hbkjp(w6zNF
z5!1K_5*<R6_3)!)U-}2XSk7M@MI@3>*cDHd-DWjw^g>p@gw@%d)o|k0?(tjSQ?sT@
zW_g49^7FI@qM9{I6OsseH4zh(-Rza1jPXEr0~<hHZj#S`S4kE7cRNAPPWkq-xN&FP
TsEzzz_@4yKgl%!-3)lY!^{ik>

diff --git a/journalbeat/tests/system/input/test.registry b/journalbeat/tests/system/input/test.registry
index 5c6680edb42..9b9dee108b3 100644
--- a/journalbeat/tests/system/input/test.registry
+++ b/journalbeat/tests/system/input/test.registry
@@ -1,6 +1,6 @@
 update_time: 2018-09-11T10:06:50.895829905Z
 journal_entries:
 - path: /home/n/go/src/github.com/elastic/beats/journalbeat/tests/system/input/test.journal
-  cursor: s=7d22fd7aa0c7482d88c303f47d5f32dc;i=2fcb;b=902dc834f07d4f41ade064f6b2ef8b4f;m=1bf0ff5c6d;t=55913a25fe765;x=c7e6480eec30822b
-  realtime_timestamp: 1505315746998117
-  monotonic_timestamp: 120007384173
+  cursor: s=018329e08e3a45a0ae03694421c4f553;i=2015d;b=fa3c2e3080dc4cd5be5cb5a43e140d51;m=29102136a4;t=5ab0792b1dc62;x=84a1467480b8f1af
+  realtime_timestamp: 1595423897803874
+  monotonic_timestamp: 176364271268
diff --git a/journalbeat/tests/system/test_base.py b/journalbeat/tests/system/test_base.py
index a94d4a7473c..ad3c133a422 100644
--- a/journalbeat/tests/system/test_base.py
+++ b/journalbeat/tests/system/test_base.py
@@ -44,19 +44,14 @@ def test_start_with_journal_directory(self):
         )
         journalbeat_proc = self.start_beat()
 
-        required_log_snippets = [
-            # journalbeat can be started
-            "journalbeat is running",
-            # journalbeat can seek to the position defined in the cursor
-            "Tailing the journal file",
-        ]
-        for snippet in required_log_snippets:
-            self.wait_until(lambda: self.log_contains(snippet),
-                            name="Line in '{}' Journalbeat log".format(snippet))
+        self.wait_until(lambda: self.log_contains("journalbeat is running"))
 
         exit_code = journalbeat_proc.kill_and_wait()
         assert exit_code == 0
 
+        # journalbeat is tailing an inactive journal
+        assert self.output_is_empty()
+
     @unittest.skipUnless(sys.platform.startswith("linux"), "Journald only on Linux")
     def test_start_with_selected_journal_file(self):
         """
@@ -73,17 +68,7 @@ def test_start_with_selected_journal_file(self):
         )
         journalbeat_proc = self.start_beat()
 
-        required_log_snippets = [
-            # journalbeat can be started
-            "journalbeat is running",
-            # journalbeat can seek to the position defined in the cursor
-            "Reading from the beginning of the journal file",
-            # message can be read from test journal
-            "\"message\": \"thinkpad_acpi: unhandled HKEY event 0x60b0\"",
-        ]
-        for snippet in required_log_snippets:
-            self.wait_until(lambda: self.log_contains(snippet),
-                            name="Line in '{}' Journalbeat log".format(snippet))
+        self.wait_until(lambda: self.output_has(lines=23))
 
         exit_code = journalbeat_proc.kill_and_wait()
         assert exit_code == 0
@@ -105,21 +90,14 @@ def test_start_with_selected_journal_file_with_cursor_fallback(self):
         )
         journalbeat_proc = self.start_beat()
 
-        required_log_snippets = [
-            # journalbeat can be started
-            "journalbeat is running",
-            # journalbeat can seek to the position defined in cursor_seek_fallback.
-            "Seeking method set to cursor, but no state is saved for reader. Starting to read from the end",
-            # message can be read from test journal
-            "\"message\": \"thinkpad_acpi: please report the conditions when this event happened to ibm-acpi-devel@lists.sourceforge.net\"",
-        ]
-        for snippet in required_log_snippets:
-            self.wait_until(lambda: self.log_contains(snippet),
-                            name="Line in '{}' Journalbeat log".format(snippet))
+        self.wait_until(lambda: self.log_contains("journalbeat is running"))
 
         exit_code = journalbeat_proc.kill_and_wait()
         assert exit_code == 0
 
+        # journalbeat is tailing an inactive journal with no cursor data
+        assert self.output_is_empty()
+
     @unittest.skipUnless(sys.platform.startswith("linux"), "Journald only on Linux")
     def test_read_events_with_existing_registry(self):
         """
@@ -142,19 +120,7 @@ def test_read_events_with_existing_registry(self):
         )
         journalbeat_proc = self.start_beat()
 
-        required_log_snippets = [
-            # journalbeat can be started
-            "journalbeat is running",
-            # journalbeat can seek to the position defined in the cursor
-            "Seeked to position defined in cursor",
-            # message can be read from test journal
-            "please report the conditions when this event happened to",
-            # only one event is read and published
-            'journalbeat successfully published events\t{"event.count": 1}',
-        ]
-        for snippet in required_log_snippets:
-            self.wait_until(lambda: self.log_contains(snippet),
-                            name="Line in '{}' Journalbeat log".format(snippet))
+        self.wait_until(lambda: self.output_has(lines=9))
 
         exit_code = journalbeat_proc.kill_and_wait()
         assert exit_code == 0
@@ -172,27 +138,13 @@ def test_read_events_with_include_matches(self):
                 ],
                 "seek": "head",
                 "include_matches": [
-                    "syslog.priority=5",
+                    "syslog.priority=6",
                 ]
             }],
         )
         journalbeat_proc = self.start_beat()
 
-        required_log_snippets = [
-            # journalbeat can be started
-            "journalbeat is running",
-            # journalbeat can seek to the position defined in the cursor
-            "Added matcher expression",
-            # message can be read from test journal
-            "unhandled HKEY event 0x60b0",
-            "please report the conditions when this event happened to",
-            "unhandled HKEY event 0x60b1",
-            # Four events with priority 5 is publised
-            'journalbeat successfully published events\t{"event.count": 4}',
-        ]
-        for snippet in required_log_snippets:
-            self.wait_until(lambda: self.log_contains(snippet),
-                            name="Line in '{}' Journalbeat log".format(snippet))
+        self.wait_until(lambda: self.output_has(lines=6))
 
         exit_code = journalbeat_proc.kill_and_wait()
         assert exit_code == 0
diff --git a/libbeat/tests/system/beat/beat.py b/libbeat/tests/system/beat/beat.py
index 65e0a6d5ad5..199f8b2c23a 100644
--- a/libbeat/tests/system/beat/beat.py
+++ b/libbeat/tests/system/beat/beat.py
@@ -488,6 +488,21 @@ def output_has(self, lines, output_file=None):
         except IOError:
             return False
 
+    def output_is_empty(self, output_file=None):
+        """
+        Returns true if the output is empty.
+        """
+
+        # Init defaults
+        if output_file is None:
+            output_file = "output/" + self.beat_name
+
+        try:
+            with open(os.path.join(self.working_dir, output_file, ), "r", encoding="utf_8") as f:
+                return len([1 for line in f]) == 0
+        except IOError:
+            return True
+
     def output_has_message(self, message, output_file=None):
         """
         Returns true if the output has the given message field.