zope.testing

Merge lp:~benji/zope.testing/3.9.4-fork into lp:~launchpad/zope.testing/3.9.4-fork

  1. 3.9.4-fork
  2. Merge into 3.9.4-fork
Proposed by Benji York on 2012-04-03
Status: Merged
Merged at revision: 25
Proposed branch: lp:~benji/zope.testing/3.9.4-fork
Merge into: lp:~launchpad/zope.testing/3.9.4-fork
Diff against target: 285 lines (+53/-48)
2 files modified
src/zope/testing/testrunner/formatter.py (+1/-4)
src/zope/testing/testrunner/testrunner-subunit.txt (+52/-44)
To merge this branch: bzr merge lp:~benji/zope.testing/3.9.4-fork
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve on 2012-04-03
ZTK steering group 2012-04-03 Pending
Review via email: mp+100681@code.launchpad.net

Description of the Change

Port the p4 fix for zope.testing --subunit --list to the new zope.testing fork branch.

To post a comment you must log in.
lp:~benji/zope.testing/3.9.4-fork updated on 2012-04-03
28. By Benji York on 2012-04-03

remove debug config that wasn't supposed to be comitted

Gary Poster (gary) wrote :

Thanks, Benji

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/zope/testing/testrunner/formatter.py'
2--- src/zope/testing/testrunner/formatter.py 2012-03-28 10:01:53 +0000
3+++ src/zope/testing/testrunner/formatter.py 2012-04-03 19:55:26 +0000
4@@ -1014,11 +1014,8 @@
5
6 def list_of_tests(self, tests, layer_name):
7 """Report a list of test names."""
8- self._enter_layer(layer_name)
9 for test in tests:
10- self._subunit.startTest(test)
11- self._subunit.addSuccess(test)
12- self._exit_layer(layer_name)
13+ print test.id()
14
15 def _get_text_details(self, name, text):
16 """Get a details dictionary that just has some plain text."""
17
18=== modified file 'src/zope/testing/testrunner/testrunner-subunit.txt'
19--- src/zope/testing/testrunner/testrunner-subunit.txt 2012-03-26 16:06:56 +0000
20+++ src/zope/testing/testrunner/testrunner-subunit.txt 2012-04-03 19:55:26 +0000
21@@ -168,20 +168,12 @@
22 >>> sys.argv = (
23 ... 'test --layer 122 --list-tests --subunit -t TestNotMuch').split()
24 >>> testrunner.run_internal(defaults)
25- tags: zope:layer:samplelayers.Layer122
26- test: sample1.sampletests.test122.TestNotMuch.test_1
27- successful: sample1.sampletests.test122.TestNotMuch.test_1
28- test: sample1.sampletests.test122.TestNotMuch.test_2
29- successful: sample1.sampletests.test122.TestNotMuch.test_2
30- test: sample1.sampletests.test122.TestNotMuch.test_3
31- successful: sample1.sampletests.test122.TestNotMuch.test_3
32- test: sampletests.test122.TestNotMuch.test_1
33- successful: sampletests.test122.TestNotMuch.test_1
34- test: sampletests.test122.TestNotMuch.test_2
35- successful: sampletests.test122.TestNotMuch.test_2
36- test: sampletests.test122.TestNotMuch.test_3
37- successful: sampletests.test122.TestNotMuch.test_3
38- tags: -zope:layer:samplelayers.Layer122
39+ sample1.sampletests.test122.TestNotMuch.test_1
40+ sample1.sampletests.test122.TestNotMuch.test_2
41+ sample1.sampletests.test122.TestNotMuch.test_3
42+ sampletests.test122.TestNotMuch.test_1
43+ sampletests.test122.TestNotMuch.test_2
44+ sampletests.test122.TestNotMuch.test_3
45 False
46
47
48@@ -382,7 +374,6 @@
49 test: sample2.sampletests_i
50 tags: zope:import_error
51 error: sample2.sampletests_i [
52- Traceback (most recent call last):
53 testrunner-ex/sample2/sampletests_i.py", line 1
54 importx unittest
55 ^
56@@ -453,7 +444,9 @@
57 time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
58 successful: sample2.sampletests_ntd.Layer:setUp
59 tags: zope:layer:sample2.sampletests_ntd.Layer
60+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
61 test: sample2.sampletests_ntd.TestSomething.test_something
62+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
63 successful: sample2.sampletests_ntd.TestSomething.test_something
64 tags: -zope:layer:sample2.sampletests_ntd.Layer
65 time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
66@@ -472,7 +465,9 @@
67 time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
68 successful: sample3.sampletests_ntd.Layer:setUp
69 tags: zope:layer:sample3.sampletests_ntd.Layer
70+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
71 test: sample3.sampletests_ntd.TestSomething.test_error1
72+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
73 error: sample3.sampletests_ntd.TestSomething.test_error1 [ multipart
74 Content-Type: text/x-traceback;charset=utf8,language=python
75 traceback
76@@ -485,7 +480,9 @@
77 0\r
78 <BLANKLINE>
79 ]
80+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
81 test: sample3.sampletests_ntd.TestSomething.test_error2
82+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
83 error: sample3.sampletests_ntd.TestSomething.test_error2 [ multipart
84 Content-Type: text/x-traceback;charset=utf8,language=python
85 traceback
86@@ -498,7 +495,9 @@
87 0\r
88 <BLANKLINE>
89 ]
90+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
91 test: sample3.sampletests_ntd.TestSomething.test_fail1
92+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
93 failure: sample3.sampletests_ntd.TestSomething.test_fail1 [ multipart
94 Content-Type: text/x-traceback;charset=utf8,language=python
95 traceback
96@@ -511,7 +510,9 @@
97 0\r
98 <BLANKLINE>
99 ]
100+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
101 test: sample3.sampletests_ntd.TestSomething.test_fail2
102+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
103 failure: sample3.sampletests_ntd.TestSomething.test_fail2 [ multipart
104 Content-Type: text/x-traceback;charset=utf8,language=python
105 traceback
106@@ -524,9 +525,13 @@
107 0\r
108 <BLANKLINE>
109 ]
110+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
111 test: sample3.sampletests_ntd.TestSomething.test_something
112+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
113 successful: sample3.sampletests_ntd.TestSomething.test_something
114+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
115 test: sample3.sampletests_ntd.TestSomething.test_something_else
116+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
117 successful: sample3.sampletests_ntd.TestSomething.test_something_else
118 tags: -zope:layer:sample3.sampletests_ntd.Layer
119 time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
120@@ -543,60 +548,62 @@
121 >>> sys.argv = [testrunner_script, '--tests-pattern', 'sampletests_ntd$',
122 ... '-D', ]
123 >>> testrunner.run_internal(defaults)
124- time: 2010-02-10 22:41:25.279692Z
125+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
126 test: sample1.sampletests_ntd.Layer:setUp
127 tags: zope:layer
128- time: 2010-02-10 22:41:25.279695Z
129+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
130 successful: sample1.sampletests_ntd.Layer:setUp
131 tags: zope:layer:sample1.sampletests_ntd.Layer
132 test: sample1.sampletests_ntd.TestSomething.test_something
133 successful: sample1.sampletests_ntd.TestSomething.test_something
134 tags: -zope:layer:sample1.sampletests_ntd.Layer
135- time: 2010-02-10 22:41:25.310078Z
136+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
137 test: sample1.sampletests_ntd.Layer:tearDown
138 tags: zope:layer
139- time: 2010-02-10 22:41:25.310171Z
140+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
141 skip: sample1.sampletests_ntd.Layer:tearDown [
142 tearDown not supported
143 ]
144 test: Running in a subprocess.
145 tags: zope:info_suboptimal
146 successful: Running in a subprocess.
147- time: 2010-02-10 22:41:25.753076Z
148+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
149 test: sample2.sampletests_ntd.Layer:setUp
150 tags: zope:layer
151- time: 2010-02-10 22:41:25.753079Z
152+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
153 successful: sample2.sampletests_ntd.Layer:setUp
154 tags: zope:layer:sample2.sampletests_ntd.Layer
155+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
156 test: sample2.sampletests_ntd.TestSomething.test_something
157+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
158 successful: sample2.sampletests_ntd.TestSomething.test_something
159 tags: -zope:layer:sample2.sampletests_ntd.Layer
160- time: 2010-02-10 22:41:25.779256Z
161+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
162 test: sample2.sampletests_ntd.Layer:tearDown
163 tags: zope:layer
164- time: 2010-02-10 22:41:25.779326Z
165+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
166 skip: sample2.sampletests_ntd.Layer:tearDown [
167 tearDown not supported
168 ]
169 test: Running in a subprocess.
170 tags: zope:info_suboptimal
171 successful: Running in a subprocess.
172- time: 2010-02-10 22:41:26.310296Z
173+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
174 test: sample3.sampletests_ntd.Layer:setUp
175 tags: zope:layer
176- time: 2010-02-10 22:41:26.310299Z
177+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
178 successful: sample3.sampletests_ntd.Layer:setUp
179 tags: zope:layer:sample3.sampletests_ntd.Layer
180+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
181 test: sample3.sampletests_ntd.TestSomething.test_error1
182+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
183 error: sample3.sampletests_ntd.TestSomething.test_error1 [ multipart
184 Content-Type: text/x-traceback;charset=utf8,language=python
185 traceback
186 16A\r
187 <BLANKLINE>
188 Traceback (most recent call last):
189- File "/usr/lib/python2.6/unittest.py", line 305, in debug
190- getattr(self, self._testMethodName)()
191- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 42, in test_error1
192+ testrunner-ex/sample3/sampletests_ntd.py", Line NNN, in test_error1
193 raise TypeError("Can we see errors")
194 TypeError: Can we see errors
195 0\r
196@@ -605,16 +612,16 @@
197 test: Can't post-mortem debug when running a layer as a subprocess!
198 tags: zope:error_with_banner
199 successful: Can't post-mortem debug when running a layer as a subprocess!
200+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
201 test: sample3.sampletests_ntd.TestSomething.test_error2
202+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
203 error: sample3.sampletests_ntd.TestSomething.test_error2 [ multipart
204 Content-Type: text/x-traceback;charset=utf8,language=python
205 traceback
206 15A\r
207 <BLANKLINE>
208 Traceback (most recent call last):
209- File "/usr/lib/python2.6/unittest.py", line 305, in debug
210- getattr(self, self._testMethodName)()
211- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 45, in test_error2
212+ testrunner-ex/sample3/sampletests_ntd.py", Line NNN, in test_error2
213 raise TypeError("I hope so")
214 TypeError: I hope so
215 0\r
216@@ -623,19 +630,17 @@
217 test: Can't post-mortem debug when running a layer as a subprocess!
218 tags: zope:error_with_banner
219 successful: Can't post-mortem debug when running a layer as a subprocess!
220+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
221 test: sample3.sampletests_ntd.TestSomething.test_fail1
222+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
223 error: sample3.sampletests_ntd.TestSomething.test_fail1 [ multipart
224 Content-Type: text/x-traceback;charset=utf8,language=python
225 traceback
226 1C5\r
227 <BLANKLINE>
228 Traceback (most recent call last):
229- File "/usr/lib/python2.6/unittest.py", line 305, in debug
230- getattr(self, self._testMethodName)()
231- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 48, in test_fail1
232+ testrunner-ex/sample3/sampletests_ntd.py", Line NNN, in test_fail1
233 self.assertEqual(1, 2)
234- File "/usr/lib/python2.6/unittest.py", line 350, in failUnlessEqual
235- (msg or '%r != %r' % (first, second))
236 AssertionError: 1 != 2
237 0\r
238 <BLANKLINE>
239@@ -643,35 +648,38 @@
240 test: Can't post-mortem debug when running a layer as a subprocess!
241 tags: zope:error_with_banner
242 successful: Can't post-mortem debug when running a layer as a subprocess!
243+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
244 test: sample3.sampletests_ntd.TestSomething.test_fail2
245+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
246 error: sample3.sampletests_ntd.TestSomething.test_fail2 [ multipart
247 Content-Type: text/x-traceback;charset=utf8,language=python
248 traceback
249 1C5\r
250 <BLANKLINE>
251 Traceback (most recent call last):
252- File "/usr/lib/python2.6/unittest.py", line 305, in debug
253- getattr(self, self._testMethodName)()
254- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 51, in test_fail2
255+ testrunner-ex/sample3/sampletests_ntd.py", Line NNN, in test_fail2
256 self.assertEqual(1, 3)
257- File "/usr/lib/python2.6/unittest.py", line 350, in failUnlessEqual
258- (msg or '%r != %r' % (first, second))
259 AssertionError: 1 != 3
260 0\r
261 <BLANKLINE>
262 ]
263 test: Can't post-mortem debug when running a layer as a subprocess!
264 tags: zope:error_with_banner
265- successful: Can't post-mortem debug when running a layer as a subprocess!
266+ successful: Can't post-mortem debug when running a layer as a
267+ subprocess!
268+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
269 test: sample3.sampletests_ntd.TestSomething.test_something
270+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
271 successful: sample3.sampletests_ntd.TestSomething.test_something
272+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
273 test: sample3.sampletests_ntd.TestSomething.test_something_else
274+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
275 successful: sample3.sampletests_ntd.TestSomething.test_something_else
276 tags: -zope:layer:sample3.sampletests_ntd.Layer
277- time: 2010-02-10 22:41:26.340878Z
278+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
279 test: sample3.sampletests_ntd.Layer:tearDown
280 tags: zope:layer
281- time: 2010-02-10 22:41:26.340945Z
282+ time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
283 skip: sample3.sampletests_ntd.Layer:tearDown [
284 tearDown not supported
285 ]

Subscribers

People subscribed via source and target branches