Merging upstream version 0.12.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 39 insertions, 243 deletions

diff --git a/test/test_sql.sh b/test/test_sql.sh
index 369351c..6abb5ad 100644
--- a/test/test_sql.sh
+++ b/test/test_sql.sh
@@ -1,5 +1,6 @@
 #! /bin/bash
 
+export TZ=UTC
 export YES_COLOR=1
 
 lnav_test="${top_builddir}/src/lnav-test"
@@ -29,118 +30,26 @@ run_cap_test ${lnav_test} -n \
 
 cp ${srcdir}/logfile_syslog.2 logfile_syslog_test.2
 touch -t 201511030923 logfile_syslog_test.2
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT *, log_msg_schema FROM all_logs" \
     -c ":write-csv-to -" \
     logfile_syslog_test.2
 
-check_output "all_logs does not work?" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,log_msg_format,log_msg_schema
-0,<NULL>,2015-11-03 09:23:38.000,0,info,0,<NULL>,<NULL>,<NULL>,# is up,aff2bfc3c61e7b86329b83190f0912b3
-1,<NULL>,2015-11-03 09:23:38.000,0,info,0,<NULL>,<NULL>,<NULL>,# is up,aff2bfc3c61e7b86329b83190f0912b3
-2,<NULL>,2015-11-03 09:23:38.000,0,info,0,<NULL>,<NULL>,<NULL>,# is down,506560b3c73dee057732e69a3c666718
-EOF
-
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT fields FROM logfmt_log" \
     -c ":write-json-to -" \
     ${test_dir}/logfile_logfmt.0
 
-check_output "logfmt fields are not handled correctly?" <<EOF
-[
-    {
-        "fields": {
-            "namespace": "inc-1-enh-domain-c14-ns-2",
-            "pod": "hello-inc-1-enh-domain-c14-ns-2-3-d8f465685-k75gp",
-            "reason": "",
-            "status": "Pending"
-        }
-    },
-    {
-        "fields": {
-            "error": "pod inc-1-domain-c14-ns-6/fe-inc-1-domain-c14-ns-6-5-656d9bb695-4584b is not found: PodNotFound",
-            "namespace": "inc-1-domain-c14-ns-6",
-            "pod": "fe-inc-1-domain-c14-ns-6-5-656d9bb695-4584b",
-            "uid": "be2def59-3a08-42fd-8f84-6f64cfcefa93"
-        }
-    },
-    {
-        "fields": {
-            "namespace": "inc-1-domain-c14-ns-6",
-            "pod": "fe-inc-1-domain-c14-ns-6-5-656d9bb695-4584b",
-            "uid": "be2def59-3a08-42fd-8f84-6f64cfcefa93"
-        }
-    },
-    {
-        "fields": {
-            "namespace": "inc-1-domain-c14-ns-6",
-            "pod": "fe-inc-1-domain-c14-ns-6-5-656d9bb695-4584b",
-            "uid": "be2def59-3a08-42fd-8f84-6f64cfcefa93"
-        }
-    },
-    {
-        "fields": {
-            "namespace": "inc-1-enh-domain-c14-ns-2",
-            "pod": "hello-inc-1-enh-domain-c14-ns-2-7-5ddd6bcd69-6rqct",
-            "reason": "",
-            "status": "Pending"
-        }
-    }
-]
-EOF
-
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT sc_substatus FROM w3c_log" \
     -c ":write-json-to -" \
     ${test_dir}/logfile_w3c.3
 
-check_output "w3c quoted strings are not handled correctly?" <<EOF
-[
-    {
-        "sc_substatus": 0
-    },
-    {
-        "sc_substatus": 0
-    },
-    {
-        "sc_substatus": null
-    }
-]
-EOF
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT cs_headers FROM w3c_log" \
     -c ":write-json-to -" \
     ${test_dir}/logfile_w3c.3
 
-check_output "w3c headers are not captured?" <<EOF
-[
-    {
-        "cs_headers": {
-            "User-Agent": "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36",
-            "Referer": "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en",
-            "Host": "xzy.example.com"
-        }
-    },
-    {
-        "cs_headers": {
-            "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36",
-            "Referer": null,
-            "Host": "example.hello.com"
-        }
-    },
-    {
-        "cs_headers": {
-            "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36",
-            "Referer": null,
-            "Host": "hello.example.com"
-        }
-    }
-]
-EOF
-
 run_cap_test ${lnav_test} -n \
     -c ";SELECT * FROM generate_series()" \
     ${test_dir}/logfile_access_log.0
@@ -158,34 +67,16 @@ run_cap_test ${lnav_test} -n \
     -c ";SELECT raise_error('oops!')" \
     ${test_dir}/logfile_access_log.0
 
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT basename(filepath) as name, content, length(content) FROM lnav_file" \
     -c ":write-csv-to -" \
     ${test_dir}/logfile_empty.0
 
-check_output "empty content not handled correctly?" <<EOF
-name,content,length(content)
-logfile_empty.0,,0
-EOF
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT distinct xp.node_text FROM lnav_file, xpath('//author', content) as xp" \
     -c ":write-csv-to -" \
     ${test_dir}/books.xml
 
-check_output "xpath on file content not working?" <<EOF
-node_text
-"Gambardella, Matthew"
-"Ralls, Kim"
-"Corets, Eva"
-"Randall, Cynthia"
-"Thurman, Paula"
-"Knorr, Stefan"
-"Kress, Peter"
-"O'Brien, Tim"
-"Galos, Mike"
-EOF
-
 gzip -c ${srcdir}/logfile_json.json > logfile_json.json.gz
 dd if=logfile_json.json.gz of=logfile_json-trunc.json.gz bs=64 count=2
 
@@ -212,7 +103,7 @@ ts
 2013-09-06T22:00:59.124817Z
 2013-09-06T22:00:59.124817Z
 2013-09-06T22:00:59.124817Z
-2013-09-06T22:00:59.124817Z
+2013-09-06 22:01:00Z
 2013-09-06T22:01:49.124817Z
 2013-09-06T22:01:49.124817Z
 2013-09-06T22:01:49.124817Z
@@ -263,10 +154,10 @@ run_test ${lnav_test} -n \
 check_output "time_offset in lnav_file table is not reordering?" <<EOF
 Wed May 19 12:00:01  2021 line 1
 /abc/def
-Wed May 19 12:00:02 UTC 2021 line 2
+Wed May 19 12:00:02 +0000 2021 line 2
 Wed May 19 12:00:03  2021 line 3
 /ghi/jkl
-Wed May 19 12:00:04 UTC 2021 line 4
+Wed May 19 12:00:04 +0000 2021 line 4
 EOF
 
 
@@ -280,15 +171,20 @@ EOF
 
 run_cap_test ${lnav_test} -n \
     -c ":goto 2" \
-    -c ";SELECT log_top_line()" \
+    -c ";SELECT log_top_line(), log_msg_line()" \
     ${test_dir}/logfile_uwsgi.0
 
 run_cap_test ${lnav_test} -n \
     -c ":goto 2" \
-    -c ";SELECT log_top_line()" \
+    -c ";SELECT log_top_line(), log_msg_line()" \
     ${test_dir}/logfile_empty.0
 
 run_cap_test ${lnav_test} -n \
+    -c ":goto 1" \
+    -c ";SELECT log_top_line(), log_msg_line()" \
+    ${test_dir}/logfile_multiline.0
+
+run_cap_test ${lnav_test} -n \
     -c ":goto 2" \
     -c ";SELECT log_top_datetime()" \
     ${test_dir}/logfile_uwsgi.0
@@ -317,49 +213,21 @@ s_runtime
 0.01
 EOF
 
-run_test env TZ=UTC ${lnav_test} -n \
+run_cap_test env TZ=UTC ${lnav_test} -n \
     -c ";SELECT bro_conn_log.bro_duration as duration, bro_conn_log.bro_uid, group_concat( distinct (bro_method || ' ' || bro_host)) as req from bro_http_log, bro_conn_log where bro_http_log.bro_uid = bro_conn_log.bro_uid group by bro_http_log.bro_uid order by duration desc limit 10" \
     -c ":write-csv-to -" \
     ${test_dir}/logfile_bro_http.log.0 ${test_dir}/logfile_bro_conn.log.0
 
-check_output "bro logs are not recognized?" <<EOF
-duration,bro_uid,req
-116.438679,CwFs1P2UcUdlSxD2La,GET www.reddit.com
-115.202498,CdZUPH2DKOE7zzCLE3,GET feeds.bbci.co.uk
-115.121914,CdrfXZ1NOFPEawF218,GET c.thumbs.redditmedia.com
-115.121837,CoX7zA3OJKGUOSCBY2,GET e.thumbs.redditmedia.com
-115.12181,CJxSUgkInyKSHiju1,GET e.thumbs.redditmedia.com
-115.121506,CT0JIh479jXIGt0Po1,GET f.thumbs.redditmedia.com
-115.121339,CJwUi9bdB9c1lLW44,GET f.thumbs.redditmedia.com
-115.119217,C6Q4Vm14ZJIlZhsXqk,GET a.thumbs.redditmedia.com
-72.274459,CbNCgO1MzloHRNeY4f,GET www.google.com
-71.658218,CnGze54kQWWpKqrrZ4,GET ajax.googleapis.com
-EOF
-
-run_test env TZ=UTC ${lnav_test} -n \
+run_cap_test env TZ=UTC ${lnav_test} -n \
     -c ";SELECT * FROM bro_http_log LIMIT 5" \
     -c ":write-csv-to -" \
     ${test_dir}/logfile_bro_http.log.0
 
-check_output "bro logs are not recognized?" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,bro_ts,bro_uid,bro_id_orig_h,bro_id_orig_p,bro_id_resp_h,bro_id_resp_p,bro_trans_depth,bro_method,bro_host,bro_uri,bro_referrer,bro_version,bro_user_agent,bro_request_body_len,bro_response_body_len,bro_status_code,bro_status_msg,bro_info_code,bro_info_msg,bro_tags,bro_username,bro_password,bro_proxied,bro_orig_fuids,bro_orig_filenames,bro_orig_mime_types,bro_resp_fuids,bro_resp_filenames,bro_resp_mime_types
-0,<NULL>,2011-11-03 00:19:26.452,0,info,0,<NULL>,<NULL>,<NULL>,1320279566.452687,CwFs1P2UcUdlSxD2La,192.168.2.76,52026,132.235.215.119,80,1,GET,www.reddit.com,/,<NULL>,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,109978,200,OK,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,Ftw3fJ2JJF3ntMTL2,<NULL>,text/html
-1,<NULL>,2011-11-03 00:19:26.831,379,info,0,<NULL>,<NULL>,<NULL>,1320279566.831619,CJxSUgkInyKSHiju1,192.168.2.76,52030,72.21.211.173,80,1,GET,e.thumbs.redditmedia.com,/E-pbDbmiBclPkDaX.jpg,http://www.reddit.com/,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,2300,200,OK,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,FFTf9Zdgk3YkfCKo3,<NULL>,image/jpeg
-2,<NULL>,2011-11-03 00:19:26.831,0,info,0,<NULL>,<NULL>,<NULL>,1320279566.831563,CJwUi9bdB9c1lLW44,192.168.2.76,52029,72.21.211.173,80,1,GET,f.thumbs.redditmedia.com,/BP5bQfy4o-C7cF6A.jpg,http://www.reddit.com/,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,2272,200,OK,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,FfXtOj3o7aub4vbs2j,<NULL>,image/jpeg
-3,<NULL>,2011-11-03 00:19:26.831,0,info,0,<NULL>,<NULL>,<NULL>,1320279566.831473,CoX7zA3OJKGUOSCBY2,192.168.2.76,52027,72.21.211.173,80,1,GET,e.thumbs.redditmedia.com,/SVUtep3Rhg5FTRn4.jpg,http://www.reddit.com/,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,2562,200,OK,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,F21Ybs3PTqS6O4Q2Zh,<NULL>,image/jpeg
-4,<NULL>,2011-11-03 00:19:26.831,0,info,0,<NULL>,<NULL>,<NULL>,1320279566.831643,CT0JIh479jXIGt0Po1,192.168.2.76,52031,72.21.211.173,80,1,GET,f.thumbs.redditmedia.com,/uuy31444rLSyKdHS.jpg,http://www.reddit.com/,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,1595,200,OK,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,Fdk0MZ1wQmKWAJ4WH4,<NULL>,image/jpeg
-EOF
-
-run_test env TZ=UTC ${lnav_test} -n \
+run_cap_test env TZ=UTC ${lnav_test} -n \
     -c ";SELECT * FROM bro_http_log WHERE log_level = 'error'" \
     -c ":write-csv-to -" \
     ${test_dir}/logfile_bro_http.log.0
 
-check_output "bro logs are not recognized?" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,bro_ts,bro_uid,bro_id_orig_h,bro_id_orig_p,bro_id_resp_h,bro_id_resp_p,bro_trans_depth,bro_method,bro_host,bro_uri,bro_referrer,bro_version,bro_user_agent,bro_request_body_len,bro_response_body_len,bro_status_code,bro_status_msg,bro_info_code,bro_info_msg,bro_tags,bro_username,bro_password,bro_proxied,bro_orig_fuids,bro_orig_filenames,bro_orig_mime_types,bro_resp_fuids,bro_resp_filenames,bro_resp_mime_types
-118,<NULL>,2011-11-03 00:19:49.337,18,error,0,<NULL>,<NULL>,<NULL>,1320279589.337053,CBHHuR1xFnm5C5CQBc,192.168.2.76,52074,74.125.225.76,80,1,GET,i4.ytimg.com,/vi/gDbg_GeuiSY/hqdefault.jpg,<NULL>,1.1,Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,0,893,404,Not Found,<NULL>,<NULL>,,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,F2GiAw3j1m22R2yIg2,<NULL>,image/jpeg
-EOF
-
 run_test ${lnav_test} -n \
     -c ';select log_time from access_log where log_line > 100000' \
     -c ':switch-to-view db' \
@@ -417,7 +285,7 @@ run_cap_test ${lnav_test} -n \
     -c ':spectrogram c_ip' \
     ${test_dir}/logfile_access_log.0
 
-run_cap_test env TZ=UTC LC_NUMERIC=C ${lnav_test} -n \
+run_cap_test env TZ=UTC LC_ALL=C ${lnav_test} -n \
     -c ':spectrogram bro_response_body_len' \
     ${test_dir}/logfile_bro_http.log.0
 
@@ -493,59 +361,29 @@ log_line,log_part
 EOF
 
 
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -I "${top_srcdir}/test" \
     -c ";select * from web_status" \
     -c ':write-csv-to -' \
     ${test_dir}/logfile_access_log.0
 
-check_output "access_log table is not working" <<EOF
-group_concat(cs_uri_stem),sc_status
-"/vmw/cgi/tramp,/vmw/vSphere/default/vmkernel.gz",200
-/vmw/vSphere/default/vmkboot.gz,404
-EOF
-
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";select * from access_log" \
     -c ':write-csv-to -' \
     ${test_dir}/logfile_access_log.0
 
-check_output "access_log table is not working" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,c_ip,cs_method,cs_referer,cs_uri_query,cs_uri_stem,cs_user_agent,cs_username,cs_version,sc_bytes,sc_status,cs_host
-0,<NULL>,2009-07-20 22:59:26.000,0,info,0,<NULL>,<NULL>,<NULL>,192.168.202.254,GET,-,<NULL>,/vmw/cgi/tramp,gPXE/0.9.7,-,HTTP/1.0,134,200,<NULL>
-1,<NULL>,2009-07-20 22:59:29.000,3000,error,0,<NULL>,<NULL>,<NULL>,192.168.202.254,GET,-,<NULL>,/vmw/vSphere/default/vmkboot.gz,gPXE/0.9.7,-,HTTP/1.0,46210,404,<NULL>
-2,<NULL>,2009-07-20 22:59:29.000,0,info,0,<NULL>,<NULL>,<NULL>,192.168.202.254,GET,-,<NULL>,/vmw/vSphere/default/vmkernel.gz,gPXE/0.9.7,-,HTTP/1.0,78929,200,<NULL>
-EOF
-
-
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";select * from access_log where log_level >= 'warning'" \
     -c ':write-csv-to -' \
     ${test_dir}/logfile_access_log.0
 
-check_output "loglevel collator is not working" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,c_ip,cs_method,cs_referer,cs_uri_query,cs_uri_stem,cs_user_agent,cs_username,cs_version,sc_bytes,sc_status,cs_host
-1,<NULL>,2009-07-20 22:59:29.000,3000,error,0,<NULL>,<NULL>,<NULL>,192.168.202.254,GET,-,<NULL>,/vmw/vSphere/default/vmkboot.gz,gPXE/0.9.7,-,HTTP/1.0,46210,404,<NULL>
-EOF
-
-
 # XXX The timestamp on the file is used to determine the year for syslog files.
 touch -t 200711030923 ${test_dir}/logfile_syslog.0
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";select * from syslog_log" \
     -c ':write-csv-to -' \
     ${test_dir}/logfile_syslog.0
 
-check_output "syslog_log table is not working" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,log_hostname,log_msgid,log_pid,log_pri,log_procname,log_struct,log_syslog_tag,syslog_version
-0,<NULL>,2007-11-03 09:23:38.000,0,error,0,<NULL>,<NULL>,<NULL>,veridian,<NULL>,7998,<NULL>,automount,<NULL>,automount[7998],<NULL>
-1,<NULL>,2007-11-03 09:23:38.000,0,info,0,<NULL>,<NULL>,<NULL>,veridian,<NULL>,16442,<NULL>,automount,<NULL>,automount[16442],<NULL>
-2,<NULL>,2007-11-03 09:23:38.000,0,error,0,<NULL>,<NULL>,<NULL>,veridian,<NULL>,7999,<NULL>,automount,<NULL>,automount[7999],<NULL>
-3,<NULL>,2007-11-03 09:47:02.000,1404000,info,0,<NULL>,<NULL>,<NULL>,veridian,<NULL>,<NULL>,<NULL>,sudo,<NULL>,sudo,<NULL>
-EOF
-
-
 run_test ${lnav_test} -n \
     -c ";select * from syslog_log where log_time >= NULL" \
     -c ':write-csv-to -' \
@@ -736,8 +574,8 @@ check_output "schema view is not working" <<EOF
 ATTACH DATABASE '' AS 'main';
 CREATE VIRTUAL TABLE environ USING environ_vtab_impl();
 CREATE VIRTUAL TABLE lnav_static_files USING lnav_static_file_vtab_impl();
-CREATE VIRTUAL TABLE lnav_views USING lnav_views_impl();
 CREATE VIRTUAL TABLE lnav_view_filter_stats USING lnav_view_filter_stats_impl();
+CREATE VIRTUAL TABLE lnav_views USING lnav_views_impl();
 CREATE VIRTUAL TABLE lnav_view_files USING lnav_view_files_impl();
 CREATE VIRTUAL TABLE lnav_view_stack USING lnav_view_stack_impl();
 CREATE VIRTUAL TABLE lnav_view_filters USING lnav_view_filters_impl();
@@ -816,58 +654,19 @@ log_line,log_part
 2,<NULL>
 EOF
 
+# test the partitions defined in the format
+run_cap_test ${lnav_test} -n \
+    -I ${test_dir} \
+    -c ";SELECT log_line, log_part, log_body FROM syslog_log" \
+    -c ":write-csv-to -" \
+    ${test_dir}/logfile_partitions.0
 
-run_test ${lnav_test} -n \
+run_cap_test ${lnav_test} -n \
     -c ";SELECT * FROM openam_log" \
     -c ":write-json-to -" \
     ${test_dir}/logfile_openam.0
 
-check_output "write-json-to isn't working?" <<EOF
-[
-    {
-        "log_line": 0,
-        "log_part": null,
-        "log_time": "2014-06-15 01:04:52.000",
-        "log_idle_msecs": 0,
-        "log_level": "info",
-        "log_mark": 0,
-        "log_comment": null,
-        "log_tags": null,
-        "log_filters": null,
-        "contextid": "82e87195d704585501",
-        "data": "http://localhost:8086|/|<samlp:Response xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" ID=\"s2daac0735bf476f4560aab81104b623bedfb0cbc0\" InResponseTo=\"84cbf2be33f6410bbe55877545a93f02\" Version=\"2.0\" IssueInstant=\"2014-06-15T01:04:52Z\" Destination=\"http://localhost:8086/api/1/rest/admin/org/530e42ccd6f45fd16d0d0717/saml/consume\"><saml:Issuer xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\">http://openam.vagrant.dev/openam</saml:Issuer><samlp:Status xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\">\\\\n<samlp:StatusCode  xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\"\\\\nValue=\"urn:oasis:names:tc:SAML:2.0:status:Success\">\\\\n</samlp:StatusCode>\\\\n</samlp:Status><saml:Assertion xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"s2a0bee0da937e236167e99b209802056033816ac2\" IssueInstant=\"2014-06-15T01:04:52Z\" Version=\"2.0\">\\\\n<saml:Issuer>http://openam.vagrant.dev/openam</saml:Issuer><ds:Signature xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\">\\\\n<ds:SignedInfo>\\\\n<ds:CanonicalizationMethod Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"/>\\\\n<ds:SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>\\\\n<ds:Reference URI=\"#s2a0bee0da937e236167e99b209802056033816ac2\">\\\\n<ds:Transforms>\\\\n<ds:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/>\\\\n<ds:Transform Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"/>\\\\n</ds:Transforms>\\\\n<ds:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>\\\\n<ds:DigestValue>4uSmVzjovUdQd3px/RcnoxQBsqE=</ds:DigestValue>\\\\n</ds:Reference>\\\\n</ds:SignedInfo>\\\\n<ds:SignatureValue>\\\\nhm/grge36uA6j1OWif2bTcvVTwESjmuJa27NxepW0AiV5YlcsHDl7RAIk6k/CjsSero3bxGbm56m\\\\nYncOEi9F1Tu7dS0bfx+vhm/kKTPgwZctf4GWn4qQwP+KeoZywbNj9ShsYJ+zPKzXwN4xBSuPjMxP\\\\nNf5szzjEWpOndQO/uDs=\\\\n</ds:SignatureValue>\\\\n<ds:KeyInfo>\\\\n<ds:X509Data>\\\\n<ds:X509Certificate>\\\\nMIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh\\\\nbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w\\\\nZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw\\\\nCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK\\\\nBgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B\\\\nAQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+\\\\nRkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY\\\\nJs0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U\\\\nQzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA\\\\ncGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC\\\\n/FfwWigmrW0Y0Q==\\\\n</ds:X509Certificate>\\\\n</ds:X509Data>\\\\n</ds:KeyInfo>\\\\n</ds:Signature><saml:Subject>\\\\n<saml:NameID Format=\"urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress\" NameQualifier=\"http://openam.vagrant.dev/openam\">user@example.com</saml:NameID><saml:SubjectConfirmation Method=\"urn:oasis:names:tc:SAML:2.0:cm:bearer\">\\\\n<saml:SubjectConfirmationData InResponseTo=\"84cbf2be33f6410bbe55877545a93f02\" NotOnOrAfter=\"2014-06-15T01:14:52Z\" Recipient=\"http://localhost:8086/api/1/rest/admin/org/530e42ccd6f45fd16d0d0717/saml/consume\"/></saml:SubjectConfirmation>\\\\n</saml:Subject><saml:Conditions NotBefore=\"2014-06-15T00:54:52Z\" NotOnOrAfter=\"2014-06-15T01:14:52Z\">\\\\n<saml:AudienceRestriction>\\\\n<saml:Audience>http://localhost:8086</saml:Audience>\\\\n</saml:AudienceRestriction>\\\\n</saml:Conditions>\\\\n<saml:AuthnStatement AuthnInstant=\"2014-06-15T01:00:25Z\" SessionIndex=\"s2f9b4d4b453d12b40ef3905cc959cdb40579c2301\"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion></samlp:Response>",
-        "domain": "dc=openam",
-        "hostname": "192.168.33.1\t",
-        "ipaddr": "Not Available",
-        "loggedby": "cn=dsameuser,ou=DSAME Users,dc=openam",
-        "loginid": "id=openamuser,ou=user,dc=openam",
-        "messageid": "SAML2-37",
-        "modulename": "SAML2.access",
-        "nameid": "user@example.com"
-    },
-    {
-        "log_line": 1,
-        "log_part": null,
-        "log_time": "2014-06-15 01:04:52.000",
-        "log_idle_msecs": 0,
-        "log_level": "trace",
-        "log_mark": 0,
-        "log_comment": null,
-        "log_tags": null,
-        "log_filters": null,
-        "contextid": "ec5708a7f199678a01",
-        "data": "vagrant|/",
-        "domain": "dc=openam",
-        "hostname": "127.0.1.1\t",
-        "ipaddr": "Not Available",
-        "loggedby": "cn=dsameuser,ou=DSAME Users,dc=openam",
-        "loginid": "cn=dsameuser,ou=DSAME Users,dc=openam",
-        "messageid": "COT-22",
-        "modulename": "COT.access",
-        "nameid": "Not Available"
-    }
-]
-EOF
+touch -t 200711030000 ${srcdir}/logfile_for_join.0
 
 run_cap_test ${lnav_test} -d "/tmp/lnav.err" -n \
     -c ";select log_line, col_0 from logline" \
@@ -952,18 +751,11 @@ unset LNAVSECURE
 
 
 touch -t 201503240923 ${test_dir}/logfile_syslog_with_access_log.0
-run_test ${lnav_test} -n -d /tmp/lnav.err \
+run_cap_test ${lnav_test} -n -d /tmp/lnav.err \
     -c ";select * from access_log" \
     -c ':write-csv-to -' \
     ${test_dir}/logfile_syslog_with_access_log.0
 
-check_output "access_log not found within syslog file" <<EOF
-log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,c_ip,cs_method,cs_referer,cs_uri_query,cs_uri_stem,cs_user_agent,cs_username,cs_version,sc_bytes,sc_status,cs_host
-1,<NULL>,2015-03-24 14:02:50.000,6927348000,info,0,<NULL>,<NULL>,<NULL>,127.0.0.1,GET,<NULL>,<NULL>,/includes/js/combined-javascript.js,<NULL>,-,HTTP/1.1,65508,200,<NULL>
-2,<NULL>,2015-03-24 14:02:50.000,0,error,0,<NULL>,<NULL>,<NULL>,127.0.0.1,GET,<NULL>,<NULL>,/bad.foo,<NULL>,-,HTTP/1.1,65508,404,<NULL>
-EOF
-
-
 run_test ${lnav_test} -n \
     -c ";select log_text from generic_log" \
     -c ":write-json-to -" \
@@ -1095,3 +887,7 @@ run_cap_test ${lnav_test} -n \
 
 run_cap_test ${lnav_test} -Nn \
      -c ";select *,case match_index when 2 then replicate('abc', 1000) else '' end from regexp_capture_into_json('10;50;50;50;', '(\d+);')"
+
+run_cap_test ${lnav_test} -n \
+     -c ";.msgformats" \
+     ${test_dir}/logfile_for_join.0