1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
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
|
GitWeb
