mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 23:52:59 -04:00
dev-python/daiquiri/files: remove wrong patches
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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',
|
||||
Reference in New Issue
Block a user