| 1 |
commit: 82f52bae544d9659015fe2ebf8c1098aec191b8e |
| 2 |
Author: Randy Barlow <randy <AT> electronsweatshop <DOT> com> |
| 3 |
AuthorDate: Tue May 25 03:09:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 13 21:49:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f52bae |
| 7 |
|
| 8 |
app-admin/lnav: Backport patches to fix tests |
| 9 |
|
| 10 |
This commit backports two patches from upstream to fix test |
| 11 |
failures in tests/test_sql.sh. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/713600 |
| 14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 15 |
Signed-off-by: Randy Barlow <randy <AT> electronsweatshop.com> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch | 36 +++++++++++++++++++++++ |
| 19 |
app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch | 32 ++++++++++++++++++++ |
| 20 |
app-admin/lnav/lnav-0.9.0.ebuild | 3 ++ |
| 21 |
3 files changed, 71 insertions(+) |
| 22 |
|
| 23 |
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 |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..47aef6d593d |
| 26 |
--- /dev/null |
| 27 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch |
| 28 |
@@ -0,0 +1,36 @@ |
| 29 |
+From 60dde499ac87c2399ac24ae85c98ed8cce564858 Mon Sep 17 00:00:00 2001 |
| 30 |
+From: Timothy Stack <timothyshanestack@×××××.com> |
| 31 |
+Date: Thu, 31 Dec 2020 23:23:56 -0800 |
| 32 |
+Subject: [PATCH] [tests] fix test to make it insensitive to the current date |
| 33 |
+ |
| 34 |
+Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
| 35 |
+--- |
| 36 |
+ test/test_sql.sh | 10 +++++----- |
| 37 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/test/test_sql.sh b/test/test_sql.sh |
| 40 |
+index c7480ecc..bbb98dce 100644 |
| 41 |
+--- a/test/test_sql.sh |
| 42 |
++++ b/test/test_sql.sh |
| 43 |
+@@ -1012,13 +1012,13 @@ EOF |
| 44 |
+ |
| 45 |
+ |
| 46 |
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \ |
| 47 |
+- -c ";select log_time from syslog_log where log_procname = 'automount'" |
| 48 |
++ -c ";select log_body from syslog_log where log_procname = 'automount'" |
| 49 |
+ |
| 50 |
+ check_output "querying against stdin is not working?" <<EOF |
| 51 |
+- log_time |
| 52 |
+-2020-11-03 09:23:38.000 |
| 53 |
+-2020-11-03 09:23:38.000 |
| 54 |
+-2020-11-03 09:23:38.000 |
| 55 |
++ log_body |
| 56 |
++ lookup(file): lookup for foobar failed |
| 57 |
++ attempting to mount entry /auto/opt |
| 58 |
++ lookup(file): lookup for opt failed |
| 59 |
+ EOF |
| 60 |
+ |
| 61 |
+ |
| 62 |
+-- |
| 63 |
+2.31.1 |
| 64 |
+ |
| 65 |
|
| 66 |
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 |
| 67 |
new file mode 100644 |
| 68 |
index 00000000000..58aa7264a0d |
| 69 |
--- /dev/null |
| 70 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch |
| 71 |
@@ -0,0 +1,32 @@ |
| 72 |
+From cc072d29ead6f1df896bc61b83d7d41dab0b7132 Mon Sep 17 00:00:00 2001 |
| 73 |
+From: Timothy Stack <timothyshanestack@×××××.com> |
| 74 |
+Date: Thu, 31 Dec 2020 23:26:57 -0800 |
| 75 |
+Subject: [PATCH] [tests] update another date-sensitive test |
| 76 |
+ |
| 77 |
+Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
| 78 |
+--- |
| 79 |
+ test/test_sql.sh | 6 +++--- |
| 80 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 81 |
+ |
| 82 |
+diff --git a/test/test_sql.sh b/test/test_sql.sh |
| 83 |
+index bbb98dce..22941c2a 100644 |
| 84 |
+--- a/test/test_sql.sh |
| 85 |
++++ b/test/test_sql.sh |
| 86 |
+@@ -1023,11 +1023,11 @@ EOF |
| 87 |
+ |
| 88 |
+ |
| 89 |
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \ |
| 90 |
+- -c ";select log_time from syslog_log where log_procname = 'sudo'" |
| 91 |
++ -c ";select log_body from syslog_log where log_procname = 'sudo'" |
| 92 |
+ |
| 93 |
+ check_output "single result is not working?" <<EOF |
| 94 |
+- log_time |
| 95 |
+-2020-11-03 09:47:02.000 |
| 96 |
++ log_body |
| 97 |
++ timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages |
| 98 |
+ EOF |
| 99 |
+ |
| 100 |
+ # Create a dummy database for the next couple of tests to consume. |
| 101 |
+-- |
| 102 |
+2.31.1 |
| 103 |
+ |
| 104 |
|
| 105 |
diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild |
| 106 |
index 73758b4838f..bc2f04f4935 100644 |
| 107 |
--- a/app-admin/lnav/lnav-0.9.0.ebuild |
| 108 |
+++ b/app-admin/lnav/lnav-0.9.0.ebuild |
| 109 |
@@ -29,6 +29,9 @@ PATCHES=( |
| 110 |
"${FILESDIR}"/${PN}-0.8.4-disable-tests.patch |
| 111 |
# bug 723242 |
| 112 |
"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch |
| 113 |
+ # bug 713600 |
| 114 |
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch |
| 115 |
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch |
| 116 |
) |
| 117 |
|
| 118 |
src_prepare() { |
Archives