From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1302289-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9DB34139345
for <garchives@archives.gentoo.org>; Tue, 13 Jul 2021 21:49:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C4F10E0C19;
Tue, 13 Jul 2021 21:49:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9B7ADE0C19
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Jul 2021 21:49:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D692433E690
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Jul 2021 21:49:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 53F2325
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Jul 2021 21:49:24 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1626212944.82f52bae544d9659015fe2ebf8c1098aec191b8e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch app-admin/lnav/lnav-0.9.0.ebuild
X-VCS-Directories: app-admin/lnav/files/ app-admin/lnav/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 82f52bae544d9659015fe2ebf8c1098aec191b8e
X-VCS-Branch: master
Date: Tue, 13 Jul 2021 21:49:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 34b505b3-43b2-42de-8ce3-8bfe5efb1272
X-Archives-Hash: ea0bcda14cf85487c342f8a4064c48a6
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 <timothyshanestack@gmail.com>
+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 <randy@electronsweatshop.com>
+---
+ 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 <timothyshanestack@gmail.com>
+Date: Thu, 31 Dec 2020 23:26:57 -0800
+Subject: [PATCH] [tests] update another date-sensitive test
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ 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() {