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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
|
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Mon, 28 Nov 2022 14:43:49 +0100
Subject: tests: Drop various python version handling
There are no differences in the exception strings between Python 3.10
and 3.11 and some of the if..else switches are not needed and provoke
the test to fail within Python 3.11.
Forwarded: Not-Needed
---
tests/test_test.py | 218 ++++++++++++++++-------------------------------------
1 file changed, 65 insertions(+), 153 deletions(-)
diff --git a/tests/test_test.py b/tests/test_test.py
index 60d523a..ba8a7ac 100644
--- a/tests/test_test.py
+++ b/tests/test_test.py
@@ -101,24 +101,14 @@ class TestRunnerTests(SimpleTestCase):
result = self.run_test("does_not_exist")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[:6] == [
- "E",
- "─" * 80,
- "ERROR: does_not_exist (unittest.loader._FailedTest.does_not_exist)",
- "─" * 80,
- "ImportError: Failed to import test module: does_not_exist",
- "Traceback (most recent call last):",
- ]
- else:
- assert lines[:6] == [
- "E",
- "─" * 80,
- "ERROR: does_not_exist (unittest.loader._FailedTest)",
- "─" * 80,
- "ImportError: Failed to import test module: does_not_exist",
- "Traceback (most recent call last):",
- ]
+ assert lines[:6] == [
+ "E",
+ "─" * 80,
+ "ERROR: does_not_exist (unittest.loader._FailedTest)",
+ "─" * 80,
+ "ImportError: Failed to import test module: does_not_exist",
+ "Traceback (most recent call last):",
+ ]
def test_pass_quiet(self):
result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_pass")
@@ -139,125 +129,76 @@ class TestRunnerTests(SimpleTestCase):
result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_pass")
assert result.returncode == 0
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:4] == [
- "test_pass (tests.test_test.ExampleTests.test_pass) ... ok",
- "",
- "-" * 70,
- ]
- else:
- assert lines[1:4] == [
- "test_pass (tests.test_test.ExampleTests) ... ok",
- "",
- "-" * 70,
- ]
+ assert lines[1:4] == [
+ "test_pass (tests.test_test.ExampleTests) ... ok",
+ "",
+ "-" * 70,
+ ]
def test_error_quiet(self):
result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_error")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[:2] == [
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests.test_error)",
- ]
- else:
- assert lines[:2] == [
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests)",
- ]
+ assert lines[:2] == [
+ "─" * 80,
+ "ERROR: test_error (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_error_normal(self):
result = self.run_test(f"{__name__}.ExampleTests.test_error")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:4] == [
- "E",
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests.test_error)",
- ]
- else:
- assert lines[1:4] == [
- "E",
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests)",
- ]
+ assert lines[1:4] == [
+ "E",
+ "─" * 80,
+ "ERROR: test_error (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_error_verbose(self):
result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_error")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:5] == [
- "test_error (tests.test_test.ExampleTests.test_error) ... ERROR",
- "",
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests.test_error)",
- ]
- else:
- assert lines[1:5] == [
- "test_error (tests.test_test.ExampleTests) ... ERROR",
- "",
- "─" * 80,
- "ERROR: test_error (tests.test_test.ExampleTests)",
- ]
+ assert lines[1:5] == [
+ "test_error (tests.test_test.ExampleTests) ... ERROR",
+ "",
+ "─" * 80,
+ "ERROR: test_error (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_failure_quiet(self):
result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_failure")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[:2] == [
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)",
- ]
- else:
- assert lines[:2] == [
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests)",
- ]
+ assert lines[:2] == [
+ "─" * 80,
+ "FAIL: test_failure (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_failure_normal(self):
result = self.run_test(f"{__name__}.ExampleTests.test_failure")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:4] == [
- "F",
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)",
- ]
- else:
- assert lines[1:4] == [
- "F",
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests)",
- ]
+ assert lines[1:4] == [
+ "F",
+ "─" * 80,
+ "FAIL: test_failure (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_failure_verbose(self):
result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_failure")
assert result.returncode == 1
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:5] == [
- "test_failure (tests.test_test.ExampleTests.test_failure) ... FAIL",
- "",
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)",
- ]
- else:
- assert lines[1:5] == [
- "test_failure (tests.test_test.ExampleTests) ... FAIL",
- "",
- "─" * 80,
- "FAIL: test_failure (tests.test_test.ExampleTests)",
- ]
+ assert lines[1:5] == [
+ "test_failure (tests.test_test.ExampleTests) ... FAIL",
+ "",
+ "─" * 80,
+ "FAIL: test_failure (tests.test_test.ExampleTests)",
+ ]
assert "─ locals ─" in result.stderr
def test_skip_quiet(self):
@@ -282,7 +223,7 @@ class TestRunnerTests(SimpleTestCase):
if sys.version_info >= (3, 11):
assert lines[1:4] == [
(
- "test_skip (tests.test_test.ExampleTests.test_skip) ... "
+ "test_skip (tests.test_test.ExampleTests) ... "
+ "skipped 'some reason'"
),
"",
@@ -318,24 +259,14 @@ class TestRunnerTests(SimpleTestCase):
)
assert result.returncode == 0
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:4] == [
- (
- "test_expected_failure (tests.test_test.ExampleTests."
- + "test_expected_failure) ... expected failure"
- ),
- "",
- "-" * 70,
- ]
- else:
- assert lines[1:4] == [
- (
- "test_expected_failure (tests.test_test.ExampleTests) ... "
- + "expected failure"
- ),
- "",
- "-" * 70,
- ]
+ assert lines[1:4] == [
+ (
+ "test_expected_failure (tests.test_test.ExampleTests)"
+ + " ... expected failure"
+ ),
+ "",
+ "-" * 70,
+ ]
def test_unexpected_success_quiet(self):
result = self.run_test(
@@ -347,10 +278,7 @@ class TestRunnerTests(SimpleTestCase):
else:
assert result.returncode == 0
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[:1] == ["=" * 70]
- else:
- assert lines[:1] == ["-" * 70]
+ assert lines[:1] == ["-" * 70]
def test_unexpected_success_normal(self):
result = self.run_test(f"{__name__}.ExampleTests.test_unexpected_success")
@@ -360,16 +288,10 @@ class TestRunnerTests(SimpleTestCase):
else:
assert result.returncode == 0
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:3] == [
- "u",
- "=" * 70,
- ]
- else:
- assert lines[1:3] == [
- "u",
- "-" * 70,
- ]
+ assert lines[1:3] == [
+ "u",
+ "-" * 70,
+ ]
def test_unexpected_success_verbose(self):
result = self.run_test(
@@ -380,24 +302,14 @@ class TestRunnerTests(SimpleTestCase):
else:
assert result.returncode == 0
lines = result.stderr.splitlines()
- if sys.version_info >= (3, 11):
- assert lines[1:4] == [
- (
- "test_unexpected_success (tests.test_test.ExampleTests."
- + "test_unexpected_success) ... unexpected success"
- ),
- "",
- "=" * 70,
- ]
- else:
- assert lines[1:4] == [
- (
- "test_unexpected_success (tests.test_test.ExampleTests) "
- + "... unexpected success"
- ),
- "",
- "-" * 70,
- ]
+ assert lines[1:4] == [
+ (
+ "test_unexpected_success (tests.test_test.ExampleTests) "
+ + "... unexpected success"
+ ),
+ "",
+ "-" * 70,
+ ]
def test_debug_sql(self):
result = self.run_test(
|
