commit 356574a: [Test] Exercise rspamadm lua logger in functional tests

Andrew Lewis nerf at judo.za.org
Mon Jul 29 17:49:46 UTC 2024


Author: Andrew Lewis
Date: 2023-12-06 14:30:14 +0200
URL: https://github.com/rspamd/rspamd/commit/356574a219e1b5ac22017d9d152e9b48fde6fe25 (refs/pull/4728/head)

[Test] Exercise rspamadm lua logger in functional tests

---
 test/functional/cases/150_rspamadm.robot      | 9 +++++++--
 test/functional/lua/rspamadm/test_batch.lua   | 5 ++++-
 test/functional/lua/rspamadm/test_verbose.lua | 3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/functional/cases/150_rspamadm.robot b/test/functional/cases/150_rspamadm.robot
index 879d4d7e8..83229dd11 100644
--- a/test/functional/cases/150_rspamadm.robot
+++ b/test/functional/cases/150_rspamadm.robot
@@ -34,7 +34,12 @@ Process message callback
 
 Lua batch mode
   ${result} =  Run Process  ${RSPAMADM}  lua  -b  ${RSPAMD_TESTDIR}/lua/rspamadm/test_batch.lua
-  Should Match Regexp  ${result.stderr}  ^$
+  Should Be Equal  ${result.stderr}  hello world
+  Should Match Regexp  ${result.stdout}  ^$
   Should Be Equal As Integers  ${result.rc}  0
-  Should Be Equal  ${result.stdout}  hello world
 
+Verbose mode
+  ${result} =  Run Process  ${RSPAMADM}  -v  lua  ${RSPAMD_TESTDIR}/lua/rspamadm/test_verbose.lua
+  Should Match Regexp  ${result.stderr}  ^$
+  Should Match Regexp  ${result.stdout}  hello world\n
+  Should Be Equal As Integers  ${result.rc}  0
diff --git a/test/functional/lua/rspamadm/test_batch.lua b/test/functional/lua/rspamadm/test_batch.lua
index e75154b7c..dd50c9db5 100644
--- a/test/functional/lua/rspamadm/test_batch.lua
+++ b/test/functional/lua/rspamadm/test_batch.lua
@@ -1 +1,4 @@
-print("hello world")
\ No newline at end of file
+local rspamd_logger = require "rspamd_logger"
+
+rspamd_logger.info(rspamd_config, "nope")
+rspamd_logger.err(rspamd_config, "hello world")
diff --git a/test/functional/lua/rspamadm/test_verbose.lua b/test/functional/lua/rspamadm/test_verbose.lua
new file mode 100644
index 000000000..4470c63e2
--- /dev/null
+++ b/test/functional/lua/rspamadm/test_verbose.lua
@@ -0,0 +1,3 @@
+local rspamd_logger = require "rspamd_logger"
+
+rspamd_logger.info(rspamd_config, "hello world")


More information about the Commits mailing list