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 7F02C1382C5 for ; Wed, 27 Jan 2021 18:17:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF8B2E0C39; Wed, 27 Jan 2021 18:17:28 +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 98657E0C39 for ; Wed, 27 Jan 2021 18:17:28 +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 5DE6D340E01 for ; Wed, 27 Jan 2021 18:17:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED17F4AB for ; Wed, 27 Jan 2021 18:17:25 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1611771436.23222e6e3da6ac7b9dd6561970647c1305bc7337.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pid/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pid/files/pid-2.2.5-fix_tests.patch X-VCS-Directories: dev-python/pid/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 23222e6e3da6ac7b9dd6561970647c1305bc7337 X-VCS-Branch: master Date: Wed, 27 Jan 2021 18:17:25 +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: 97847001-9153-42f5-8467-ce15912340ff X-Archives-Hash: 977bcfea608768a36a203ee61188d79a commit: 23222e6e3da6ac7b9dd6561970647c1305bc7337 Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jan 27 12:49:39 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Wed Jan 27 18:17:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23222e6e dev-python/pid: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/19237 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Conrad Kostecki gentoo.org> dev-python/pid/files/pid-2.2.5-fix_tests.patch | 31 -------------------------- 1 file changed, 31 deletions(-) diff --git a/dev-python/pid/files/pid-2.2.5-fix_tests.patch b/dev-python/pid/files/pid-2.2.5-fix_tests.patch deleted file mode 100644 index 3184e631ee7..00000000000 --- a/dev-python/pid/files/pid-2.2.5-fix_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_pid.py b/tests/test_pid.py -index 28fda19..99e2a29 100644 ---- a/tests/test_pid.py -+++ b/tests/test_pid.py -@@ -170,13 +170,13 @@ def test_pid_already_locked_custom_name(): - def test_pid_already_locked_multi_process(): - with pid.PidFile() as _pid: - s = ''' --import pid --with pid.PidFile("pytest", piddir="/tmp"): -+import os, pid, sys -+with pid.PidFile(os.path.basename(sys.argv[0]), piddir="/tmp"): - pass - ''' -- result = run(['python', '-c', s]) -+ result = run([sys.executable, '-c', s]) - returncode = result if isinstance(result, int) else result.returncode -- assert returncode == 1 -+ assert returncode == 0 - assert os.path.exists(_pid.filename) - assert not os.path.exists(_pid.filename) - -@@ -189,7 +189,7 @@ with pid.PidFile("pytest2", piddir="/tmp") as _pid: - assert os.path.exists(_pid.filename) - assert not os.path.exists(_pid.filename) - ''' -- result = run(['python', '-c', s]) -+ result = run([sys.executable, '-c', s]) - returncode = result if isinstance(result, int) else result.returncode - assert returncode == 0 - assert os.path.exists(_pid.filename)