From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324634-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 19DF9158013
for <garchives@archives.gentoo.org>; Sun, 26 Sep 2021 18:42:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 64C3DE09CB;
Sun, 26 Sep 2021 18:42:42 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3D48EE09CB
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 18:42:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 161A4342E72
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 18:42:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FA4F102
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 18:42:39 +0000 (UTC)
From: "Alessandro Barbieri" <lssndrbarbieri@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" <lssndrbarbieri@gmail.com>
Message-ID: <1632681743.769b96c1ae9acb6e012823009f21b124b9fb693f.Alessandro-Barbieri@gentoo>
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/files/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch
X-VCS-Directories: dev-python/daiquiri/files/
X-VCS-Committer: Alessandro-Barbieri
X-VCS-Committer-Name: Alessandro Barbieri
X-VCS-Revision: 769b96c1ae9acb6e012823009f21b124b9fb693f
X-VCS-Branch: dev
Date: Sun, 26 Sep 2021 18:42:39 +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: 6592f195-409d-423e-9746-48e69ddab6b3
X-Archives-Hash: 78559b240d04c93fa3d092e53a297999
commit: 769b96c1ae9acb6e012823009f21b124b9fb693f
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Sep 26 18:42:23 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Sep 26 18:42:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=769b96c1
dev-python/daiquiri/files: remove wrong patches
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../testrepository-0.0.20-test-backport.patch | 62 ----------------------
.../testrepository-0.0.20-test-backport1.patch | 16 ------
.../testrepository-0.0.20-test-backport2.patch | 49 -----------------
3 files changed, 127 deletions(-)
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch
deleted file mode 100644
index d7ab87c06..000000000
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Tue, 10 Mar 2015 15:21:49 +1300
-Subject: [PATCH] Fixup tests with latest testtools.
-
-Testtools has started chunking exceptions (which is perhaps good,
-perhaps bad) - but we shouldn't depend on the exact behaviour in it
-for our tests.
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,12 @@ testrepository release notes
- NEXT (In development)
- +++++++++++++++++++++
-
-+CHANGES
-+-------
-+
-+* Isolate the testrepository test suite from the chunking (or otherwise)
-+ behaviour of testtools' exception handlers. (Robert Collins)
-+
- 0.0.20
- ++++++
-
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -28,6 +28,7 @@
- from testresources import TestResource
- from testtools import (
- clone_test_with_new_id,
-+ content,
- PlaceHolder,
- )
- import testtools
-@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
- def passing(self):
- pass
-
-- def failing(self):
-- self.fail("oops")
--
- def unexpected_success(self):
- self.expectFailure("unexpected success", self.assertTrue, True)
-
-
-+class FailingCase:
-+
-+ def run(self, result):
-+ result.startTest(self)
-+ result.addError(
-+ self, None, details={'traceback': content.text_content("")})
-+ result.stopTest(self)
-+
- def make_test(id, should_pass):
- """Make a test."""
- if should_pass:
- case = Case("passing")
- else:
-- case = Case("failing")
-+ case = FailingCase()
- return clone_test_with_new_id(case, id)
-
-
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch
deleted file mode 100644
index 655d2c3e7..000000000
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Sun, 12 Jul 2015 21:37:34 +1200
-Subject: [PATCH] Fix 3.3+ tests with nested classnames.
-
---- a/testrepository/tests/ui/test_cli.py
-+++ b/testrepository/tests/ui/test_cli.py
-@@ -157,7 +157,7 @@ def method(self):
- self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'),
- DocTestMatches("""\
- ======================================================================
--FAIL: testrepository.tests.ui.test_cli.Case.method
-+FAIL: testrepository.tests.ui.test_cli...Case.method
- ----------------------------------------------------------------------
- ...Traceback (most recent call last):...
- File "...test_cli.py", line ..., in method
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch
deleted file mode 100644
index 69d591c2f..000000000
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
-Date: Thu, 5 Apr 2018 01:02:40 +0100
-Subject: [PATCH] Fix the testrepository tests with newer versions of
- testtools.
-
---- a/testrepository/tests/commands/test_failing.py
-+++ b/testrepository/tests/commands/test_failing.py
-@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase):
- finally:
- log.stopTestRun()
- self.assertEqual(
-- log._events, [
-+ [tuple(ev) for ev in log._events], [
- ('startTestRun',),
- ('status', 'failing', 'inprogress', None, True, None, None, False,
- None, None, Wildcard),
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -113,9 +113,10 @@ class FailingCase:
- def run(self, result):
- result.startTest(self)
- result.addError(
-- self, None, details={'traceback': content.text_content("")})
-+ self, None, details={'traceback': content.text_content("tb")})
- result.stopTest(self)
-
-+
- def make_test(id, should_pass):
- """Make a test."""
- if should_pass:
-@@ -409,7 +410,7 @@ class TestRepositoryContract(ResourcedTestCase):
- finally:
- log.stopTestRun()
- self.assertEqual(
-- log._events, [
-+ [tuple(ev) for ev in log._events], [
- ('startTestRun',),
- ('status',
- 'testrepository.tests.test_repository.Case.method',
-@@ -465,7 +466,7 @@ class TestRepositoryContract(ResourcedTestCase):
- finally:
- log.stopTestRun()
- self.assertEqual(
-- log._events,
-+ [tuple(ev) for ev in log._events],
- [
- ('startTestRun',),
- ('status',