[search-table] add test case

2 years ago · 88d9002a5d
parent d020168860
commit 88d9002a5d
6 changed files with 37 additions and 0 deletions
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -312,6 +312,7 @@ dist_noinst_DATA = \
 	logfile_syslog.0 \
 	logfile_syslog.1 \
 	logfile_syslog.2 \
+	logfile_syslog.3 \
 	logfile_syslog_fr.0 \
 	logfile_syslog_with_access_log.0 \
 	logfile_syslog_with_header.0 \
--- a/test/expected/expected.am
+++ b/test/expected/expected.am
@ -736,6 +736,8 @@ EXPECTED_FILES = \
    $(srcdir)/%reldir%/test_sql_json_func.sh_f34f5dfa938a1ac7721f924beb16bbceec127a1b.out \
    $(srcdir)/%reldir%/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.err \
    $(srcdir)/%reldir%/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out \
+    $(srcdir)/%reldir%/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.err \
+    $(srcdir)/%reldir%/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out \
    $(srcdir)/%reldir%/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.err \
    $(srcdir)/%reldir%/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out \
    $(srcdir)/%reldir%/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.err \
--- a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.err
+++ b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.err
--- a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out
+++ b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out
@ -0,0 +1,12 @@
+[1m[4mlog_line [0m[1m[4mlog_part [0m[1m[4m       log_time         [0m[1m[4m[7mlog_idle_msecs [0m[1m[4mlog_level [0m[1m[4mlog_mark [0m[1m[4mlog_comment [0m[1m[4mlog_tags [0m[1m[4mlog_filters [0m[1m[4mmatch_index [0m[1m[4m        name          [0m
+[1m[7m       2[0m[1m[7m [0m[1m[7m  <NULL>[0m[1m[7m [0m[1m[7m2022-08-16 00:32:15.000[0m[1m[7m [0m[1m[7m        199000[0m[1m[7m [0m[1m[7minfo     [0m[1m[7m [0m[1m[7m       0[0m[1m[7m [0m[1m[7m     <NULL>[0m[1m[7m [0m[1m[7m  <NULL>[0m[1m[7m [0m[1m[7m     <NULL>[0m[1m[7m [0m[1m[7m          0[0m[1m[7m [0m[1m[7mcom.apple.cdscheduler[0m[1m [0m
+       5   <NULL> 2022-08-16 00:32:15.000              0 info             0      <NULL>   <NULL>      <NULL>           0 com.apple.install     
+[1m       8[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2022-08-16 00:32:15.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m          0[0m[1m [0m[1mcom.apple.authd       [0m
+       8   <NULL> 2022-08-16 00:32:15.000              0 info             0      <NULL>   <NULL>      <NULL>           1 com.apple.asl         
+[1m       8[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2022-08-16 00:32:15.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m          2[0m[1m [0m[1mcom.apple.asl         [0m
+       8   <NULL> 2022-08-16 00:32:15.000              0 info             0      <NULL>   <NULL>      <NULL>           3 com.apple.authd       
+[1m      11[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2022-08-16 00:32:15.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m          0[0m[1m [0m[1mcom.apple.authd       [0m
+      11   <NULL> 2022-08-16 00:32:15.000              0 info             0      <NULL>   <NULL>      <NULL>           1 com.apple.asl         
+[1m      11[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2022-08-16 00:32:15.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m          2[0m[1m [0m[1mcom.apple.asl         [0m
+      11   <NULL> 2022-08-16 00:32:15.000              0 info             0      <NULL>   <NULL>      <NULL>           3 com.apple.authd       
+[1m      14[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2022-08-16 00:32:15.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m          0[0m[1m [0m[1mcom.apple.authd       [0m
--- a/test/logfile_syslog.3
+++ b/test/logfile_syslog.3
@ -0,0 +1,17 @@
+Aug 16 00:10:45 Tims-Air syslogd[314]: ASL Sender Statistics
+Aug 16 00:28:56 Tims-Air syslogd[314]: ASL Sender Statistics
+Aug 16 00:32:15 Tims-Air syslogd[314]: Configuration Notice:
+	ASL Module "com.apple.cdscheduler" claims selected messages.
+	Those messages may not appear in standard system log files or in the ASL database.
+Aug 16 00:32:15 Tims-Air syslogd[314]: Configuration Notice:
+	ASL Module "com.apple.install" claims selected messages.
+	Those messages may not appear in standard system log files or in the ASL database.
+Aug 16 00:32:15 Tims-Air syslogd[314]: Configuration Notice:
+	ASL Module "com.apple.authd" sharing output destination "/var/log/asl" with ASL Module "com.apple.asl".
+	Output parameters from ASL Module "com.apple.asl" override any specified in ASL Module "com.apple.authd".
+Aug 16 00:32:15 Tims-Air syslogd[314]: Configuration Notice:
+	ASL Module "com.apple.authd" sharing output destination "/var/log/system.log" with ASL Module "com.apple.asl".
+	Output parameters from ASL Module "com.apple.asl" override any specified in ASL Module "com.apple.authd".
+Aug 16 00:32:15 Tims-Air syslogd[314]: Configuration Notice:
+	ASL Module "com.apple.authd" claims selected messages.
+	Those messages may not appear in standard system log files or in the ASL database.
--- a/test/test_sql_search_table.sh
+++ b/test/test_sql_search_table.sh
@ -19,3 +19,8 @@ run_cap_test ${lnav_test} -n \
    -c ";select * from procstate_procs where cmd_name = '[kthreadd]'" \
    -c ";select * from procstate_procs where cmd_name = '[kthreadd]'" \
    ${test_dir}/logfile_procstate.0
+
+run_cap_test ${lnav_test} -n \
+    -c ':create-search-table asl_mod ASL Module "(?<name>[^"]+)"' \
+    -c ';SELECT * FROM asl_mod' \
+    ${test_dir}/logfile_syslog.3