From: Ricardo Martincoski Date: Wed, 16 Oct 2019 01:09:50 +0000 (-0300) Subject: support/testing: test_syslog_ng: improve commands X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f3c4a9e1cde3a305058ff46a3afc4e0e32a7c42f;p=buildroot.git support/testing: test_syslog_ng: improve commands There is no need for double grep, so choose a better regexp. Use && instead of ; between commands so the sequence of commands fail faster. Break the last sequence of commands in 2 calls run() so the proper return code can be tested for each. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- diff --git a/support/testing/tests/package/test_syslog_ng.py b/support/testing/tests/package/test_syslog_ng.py index 6cc7c18945..3fb0be5fb8 100644 --- a/support/testing/tests/package/test_syslog_ng.py +++ b/support/testing/tests/package/test_syslog_ng.py @@ -19,18 +19,20 @@ class TestSyslogNg(infra.basetest.BRTest): options=["-initrd", cpio_file]) self.emulator.login() - cmd = "grep syslog-ng /var/log/messages | grep starting" + cmd = "grep 'syslog-ng starting' /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 0) - cmd = "logger my-message;" - cmd += "sleep 1;" + cmd = "logger my-message && " + cmd += "sleep 1 && " cmd += "grep my-message /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 0) - cmd = "syslog-ng-ctl reload;" - cmd += "sleep 1;" - cmd += "grep syslog-ng /var/log/messages | grep -i warning" + cmd = "syslog-ng-ctl reload && " + cmd += "sleep 1" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + cmd = "grep -i 'syslog-ng.*warning' /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 1)