From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/
Date: Tue, 27 Jul 2021 17:29:21 +0000 (UTC) [thread overview]
Message-ID: <1627406956.48b15bf2eb35edbd9b6b328d68c5fa96d905a685.marecki@gentoo> (raw)
commit: 48b15bf2eb35edbd9b6b328d68c5fa96d905a685
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 17:28:14 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 17:29:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b15bf2
app-backup/borgmatic: get rid of vim dependency in tests
Already merged upstream so will no longer be needed come 1.5.17.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/borgmatic-1.5.16.ebuild | 3 +-
.../files/borgmatic-1.5.16-tests_no_vim_dep.patch | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-backup/borgmatic/borgmatic-1.5.16.ebuild b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
index 72cfe91c89c..faca0182b6c 100644
--- a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
@@ -25,10 +25,8 @@ RDEPEND="app-backup/borgbackup
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
')"
-# one of the tests needs xxd
BDEPEND="
test? (
- app-editors/vim-core
$(python_gen_cond_dep '
dev-python/flexmock[${PYTHON_USEDEP}]
')
@@ -38,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+ "${FILESDIR}"/${PN}-1.5.16-tests_no_vim_dep.patch # already merged upstream
)
distutils_enable_tests pytest
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
new file mode 100644
index 00000000000..492743e36e0
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
@@ -0,0 +1,34 @@
+From e8b8d86592565acde1ac6e7809947b8a761f2f91 Mon Sep 17 00:00:00 2001
+From: Marek Szuba <marek.szuba@cern.ch>
+Date: Tue, 27 Jul 2021 13:46:51 +0100
+Subject: [PATCH] tests/integration/test_execute: use plain Python rather than
+ xxd
+
+Removes this test's dependencies on vim and /dev/urandom.
+
+Signed-off-by: Marek Szuba <marek.szuba@cern.ch>
+---
+ tests/integration/test_execute.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py
+index 6dc6467..3b9bef9 100644
+--- a/tests/integration/test_execute.py
++++ b/tests/integration/test_execute.py
+@@ -1,5 +1,6 @@
+ import logging
+ import subprocess
++import sys
+
+ import pytest
+ from flexmock import flexmock
+@@ -134,7 +135,8 @@ def test_log_outputs_vents_other_processes_when_one_exits():
+ flexmock(module).should_receive('command_for_process').and_return('grep')
+
+ process = subprocess.Popen(
+- ['xxd', '-l', '40000', '-p', '/dev/urandom'], stdout=subprocess.PIPE, stderr=subprocess.PIPE
++ [sys.executable, '-c', "import random, string; print(''.join(random.choice(string.ascii_letters) for _ in range(40000)))"],
++ stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ )
+ other_process = subprocess.Popen(
+ ['true'], stdin=process.stdout, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
next reply other threads:[~2021-07-27 17:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 17:29 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-13 11:11 [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/ Petr Vaněk
2024-11-28 11:31 Petr Vaněk
2024-11-25 22:07 Petr Vaněk
2024-11-05 13:46 Petr Vaněk
2024-07-03 14:47 Petr Vaněk
2023-08-22 11:05 Marek Szuba
2023-06-07 21:59 Marek Szuba
2023-05-19 8:37 Marek Szuba
2023-05-11 12:30 Marek Szuba
2022-10-13 9:31 Marek Szuba
2021-10-12 23:03 Marek Szuba
2020-03-25 16:57 Marek Szuba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1627406956.48b15bf2eb35edbd9b6b328d68c5fa96d905a685.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox