commit: 82f52bae544d9659015fe2ebf8c1098aec191b8e Author: Randy Barlow <randy <AT> electronsweatshop <DOT> com> AuthorDate: Tue May 25 03:09:04 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jul 13 21:49:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f52bae
app-admin/lnav: Backport patches to fix tests This commit backports two patches from upstream to fix test failures in tests/test_sql.sh. Closes: https://bugs.gentoo.org/713600 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Randy Barlow <randy <AT> electronsweatshop.com> Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch | 36 +++++++++++++++++++++++ app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch | 32 ++++++++++++++++++++ app-admin/lnav/lnav-0.9.0.ebuild | 3 ++ 3 files changed, 71 insertions(+) diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch new file mode 100644 index 00000000000..47aef6d593d --- /dev/null +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch @@ -0,0 +1,36 @@ +From 60dde499ac87c2399ac24ae85c98ed8cce564858 Mon Sep 17 00:00:00 2001 +From: Timothy Stack <[email protected]> +Date: Thu, 31 Dec 2020 23:23:56 -0800 +Subject: [PATCH] [tests] fix test to make it insensitive to the current date + +Signed-off-by: Randy Barlow <[email protected]> +--- + test/test_sql.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/test/test_sql.sh b/test/test_sql.sh +index c7480ecc..bbb98dce 100644 +--- a/test/test_sql.sh ++++ b/test/test_sql.sh +@@ -1012,13 +1012,13 @@ EOF + + + cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \ +- -c ";select log_time from syslog_log where log_procname = 'automount'" ++ -c ";select log_body from syslog_log where log_procname = 'automount'" + + check_output "querying against stdin is not working?" <<EOF +- log_time +-2020-11-03 09:23:38.000 +-2020-11-03 09:23:38.000 +-2020-11-03 09:23:38.000 ++ log_body ++ lookup(file): lookup for foobar failed ++ attempting to mount entry /auto/opt ++ lookup(file): lookup for opt failed + EOF + + +-- +2.31.1 + diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch new file mode 100644 index 00000000000..58aa7264a0d --- /dev/null +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch @@ -0,0 +1,32 @@ +From cc072d29ead6f1df896bc61b83d7d41dab0b7132 Mon Sep 17 00:00:00 2001 +From: Timothy Stack <[email protected]> +Date: Thu, 31 Dec 2020 23:26:57 -0800 +Subject: [PATCH] [tests] update another date-sensitive test + +Signed-off-by: Randy Barlow <[email protected]> +--- + test/test_sql.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/test_sql.sh b/test/test_sql.sh +index bbb98dce..22941c2a 100644 +--- a/test/test_sql.sh ++++ b/test/test_sql.sh +@@ -1023,11 +1023,11 @@ EOF + + + cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \ +- -c ";select log_time from syslog_log where log_procname = 'sudo'" ++ -c ";select log_body from syslog_log where log_procname = 'sudo'" + + check_output "single result is not working?" <<EOF +- log_time +-2020-11-03 09:47:02.000 ++ log_body ++ timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages + EOF + + # Create a dummy database for the next couple of tests to consume. +-- +2.31.1 + diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild index 73758b4838f..bc2f04f4935 100644 --- a/app-admin/lnav/lnav-0.9.0.ebuild +++ b/app-admin/lnav/lnav-0.9.0.ebuild @@ -29,6 +29,9 @@ PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch # bug 723242 "${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch + # bug 713600 + "${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch + "${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch ) src_prepare() {
