diff options
Diffstat (limited to 'dev-python/testrepository')
| -rw-r--r-- | dev-python/testrepository/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch | 61 | ||||
| -rw-r--r-- | dev-python/testrepository/testrepository-0.0.20.ebuild | 1 |
3 files changed, 64 insertions, 1 deletions
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest index 15d175cd5615..d5caf33e5a32 100644 --- a/dev-python/testrepository/Manifest +++ b/dev-python/testrepository/Manifest @@ -1,8 +1,9 @@ AUX testrepository-0.0.18-test-backport.patch 1091 BLAKE2B 580037f8303fedd8636c4287e576d2071768d9b1b1d4e1a3ad91ef2a19938d1135fa3b9950a8c28e5567481b4abc5cd8fe3f1c1951fa18d711bc9429c35ee333 SHA512 ffae1e5a65a5b34d30ad6c2a3aed6b5872fb42c77cccc050e86b95683d739f7b5343676212d0e236d26ca05a3f76a7b72c45f9939c7bf6f9c6695a8f9e904298 AUX testrepository-0.0.20-test-backport.patch 1970 BLAKE2B 33cbca7f9be488ff5095ee66eb12245d7b75009f7c3f2f114c7be917eab4b14d0509b7a537e1d2354d45e98cfc6bdb2c6f0d1637a48ea38cb287ffbe18e11da0 SHA512 b12926910a8f745515734bdc504b730341263d9d3ce44a598886b4e0aa0c9452a4b187e7926fb77e00837ce5f17ffdb6c3c84d53c06005e8caa29317bc42a62b AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d71304316cf1cb5ca53ff553f9898da5bc70727d4d3aa2bfdd20b26d255806354f9edd9f681b027a6650cecd72154ed09e10605a9a87a909df SHA512 0bbeafcd9ee399a47f1a6ec7249ce9412a6d154b2738899bab75b9593a0703bf297c9a6654e8c4131ccef6daf7c111ed3033e6e3263b5cace28f135bc9593b3e +AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958d0e7e30b6ded6f463877ea1315087cdcc3feee234885b2dc5282e6c9e8e09f6f9a552e94efa48bd101b6532caa6148927d533a4a48c8 SHA512 a5c41912d9dd73b288504b25ee1ae6faabbbe75d6992485a69c61d63b762c900567ea2bdd7ca9a11904aaa7bd41f8983d50a5fede05b4d94096a0681a486d200 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6 EBUILD testrepository-0.0.18-r1.ebuild 1264 BLAKE2B 3c5a2f064654840ca87db24932e4cb5b1bef6e2a485a030d2ce84e21cd444ebb4cc6832c5ad8426c1b373c883e011844910158652be220a51359fff143ca8f68 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153 -EBUILD testrepository-0.0.20.ebuild 1268 BLAKE2B 2ee2cf75c7ca348ef836903689356f378cb7b20edb703d918c101ef51e4a38852f322e54ebad4326c012a826a8f3320c78289daadd1409c70085c6b447e005bf SHA512 cd2bab3038f0fa5753b557305ab35a8bdf725a215bffe21ae5e57f2096931f70617d7ec8e7edd3f11ca7fb974929bde6dd8e78421f001986cd4db896fb56bf5e +EBUILD testrepository-0.0.20.ebuild 1309 BLAKE2B 064838697748958b25bf67d29352f324e1662a499c296f0250c460200808a300b03cd6297230fbfe47f902195847f5c42d8c90884eb5e0fab342a1292d54115f SHA512 1ae2041ecddd638188afa59de7c329d465c4e55a763985c165223faa3a115feee25d5b97718b1241343879a2ee95a0f6e72521121a786f0ad19db57ebeb64726 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9 diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch new file mode 100644 index 000000000000..a0614b671e1a --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch @@ -0,0 +1,61 @@ +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. + +--- + testrepository/tests/commands/test_failing.py | 2 +- + testrepository/tests/test_repository.py | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/testrepository/tests/commands/test_failing.py b/testrepository/tests/commands/test_failing.py +index 56c97ef..4e52f6a 100644 +--- 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), +diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py +index 4a8667b..28d99bc 100644 +--- 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', +-- +2.18.0 + diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild index 59fbcc1f08b6..2c7ffaca0ffe 100644 --- a/dev-python/testrepository/testrepository-0.0.20.ebuild +++ b/dev-python/testrepository/testrepository-0.0.20.ebuild @@ -37,6 +37,7 @@ DISTUTILS_IN_SOURCE_BUILD=1 PATCHES=( "${FILESDIR}"/${P}-test-backport.patch "${FILESDIR}"/${P}-test-backport1.patch + "${FILESDIR}"/${P}-test-backport2.patch ) python_test() { |