From d49c6a9bdf72a7bcccabe5b78c10799d79a3f49e Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Tue, 16 May 2023 09:05:21 -0500 Subject: [PATCH 1/2] fix gelf test --- tests/gelf_test.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/gelf_test.py b/tests/gelf_test.py index e55f654e25..856499ad20 100755 --- a/tests/gelf_test.py +++ b/tests/gelf_test.py @@ -112,14 +112,11 @@ def gelfServer(stop): # find the stderr log file stderr_file = glob.glob(os.path.join(data_dir, 'stderr.*.txt')) with open(stderr_file[0], "r") as f: - stderr_lines = f.readlines() + stderr_txt = f.read().rstrip() -#Less one line because the GELF appender does not transmit 'opened GELF socket to endpoint... -assert len(stderr_lines)-1 == len(received_logs), "number of log entry received from GELF does not match stderr" - -stderr_lines.pop(0) -for (stderr_line, received_log) in zip(stderr_lines, received_logs): - assert received_log in stderr_line, "received GELF log entry does not match that of from stderr" +assert len(received_logs) > 10, "Not enough gelf logs are received" +for received_log in received_logs: + assert received_log in stderr_txt, "received GELF log entry does not match that of from stderr" if os.path.exists(Utils.DataPath): shutil.rmtree(Utils.DataPath) From 9fd2706fdad5185aa2d23812560eb68e3f56d67c Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Thu, 18 May 2023 10:25:26 -0500 Subject: [PATCH 2/2] grammar fix --- tests/gelf_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gelf_test.py b/tests/gelf_test.py index 856499ad20..6826322ee2 100755 --- a/tests/gelf_test.py +++ b/tests/gelf_test.py @@ -116,7 +116,7 @@ def gelfServer(stop): assert len(received_logs) > 10, "Not enough gelf logs are received" for received_log in received_logs: - assert received_log in stderr_txt, "received GELF log entry does not match that of from stderr" + assert received_log in stderr_txt, "received GELF log entry does not match that of stderr" if os.path.exists(Utils.DataPath): shutil.rmtree(Utils.DataPath)