[tests] try to fix some broken tests

5 months ago · 41acf21f0a
parent d8a75fc264
commit 41acf21f0a
3 changed files with 7 additions and 5 deletions
--- a/src/sql_commands.cc
+++ b/src/sql_commands.cc
@ -192,7 +192,7 @@ SELECT count(*) AS total,
    FROM all_logs
    GROUP BY log_msg_format
    HAVING total > 1
-    ORDER BY total DESC
+    ORDER BY total, log_line DESC
 )";
    std::string retval;
--- a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out
+++ b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out
@ -1,4 +1,4 @@
-[1m[4m[7mtotal [0m[1m[4m     min(log_time)      [0m[1m[4mduration [0m[1m[4mlog_formats [0m[1m[4m                    log_msg_format                      [0m
+[1m[4m[7mtotal [0m[1m[4mlog_line [0m[1m[4m       log_time         [0m[1m[4mduration [0m[1m[4mlog_formats [0m[1m[4m                    log_msg_format                      [0m
-[1m[7m    2[0m[7m [0m[7m2023-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mRegistering new address record for # on #              [0m 
+[1m[7m    2[0m[7m [0m[7m       2[0m[7m [0m[7m2023-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mRegistering new address record for # on #              [0m 
-[1m[7m    2[0m[7m [0m[7m2023-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mNew relevant interface # for #                         [0m 
+[1m[7m    2[0m[7m [0m[7m       1[0m[7m [0m[7m2023-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mJoining # multicast group on interface # with address #[0m 
-[1m[7m    2[0m[1m[7m [0m[1m[7m2023-04-28 06:53:55.000[0m[1m[7m [0m[1m[7m        [0m[1m[7m [0m[1m[7msyslog_log [0m[1m[7m [0m[1m[7mJoining # multicast group on interface # with address #[0m[1m [0m
+[1m[7m    2[0m[1m[7m [0m[1m[7m       0[0m[1m[7m [0m[1m[7m2023-04-28 06:53:55.000[0m[1m[7m [0m[1m[7m        [0m[1m[7m [0m[1m[7msyslog_log [0m[1m[7m [0m[1m[7mNew relevant interface # for #                         [0m[1m [0m
--- a/test/test_logfile.sh
+++ b/test/test_logfile.sh
@ -715,6 +715,8 @@ export HOME="./file-tz"
 rm -rf "./file-tz"
 mkdir -p $HOME
 touch -t 200711030000 ${srcdir}/logfile_syslog.0
 run_cap_test ${lnav_test} -n \
    -c ':set-file-timezone America/Los_Angeles' \
    ${test_dir}/logfile_syslog.0