From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 57A56139337 for ; Tue, 27 Jul 2021 17:29:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8427CE0875; Tue, 27 Jul 2021 17:29:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 664F6E0875 for ; Tue, 27 Jul 2021 17:29:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 20595342C54 for ; Tue, 27 Jul 2021 17:29:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 848817A2 for ; Tue, 27 Jul 2021 17:29:21 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1627406956.48b15bf2eb35edbd9b6b328d68c5fa96d905a685.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/, app-backup/borgmatic/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/borgmatic/borgmatic-1.5.16.ebuild app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch X-VCS-Directories: app-backup/borgmatic/files/ app-backup/borgmatic/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 48b15bf2eb35edbd9b6b328d68c5fa96d905a685 X-VCS-Branch: master Date: Tue, 27 Jul 2021 17:29:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7467b7b8-5019-4a56-9c7d-bac4dcfdb1eb X-Archives-Hash: 013fe93beb52cc7b77e7272c2ce4495c commit: 48b15bf2eb35edbd9b6b328d68c5fa96d905a685 Author: Marek Szuba gentoo org> AuthorDate: Tue Jul 27 17:28:14 2021 +0000 Commit: Marek Szuba gentoo 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 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}] +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 +--- + 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