testtools

Merge lp:~lifeless/testtools/2.4 into lp:~testtools-committers/testtools/trunk

  1. 2.4
  2. Merge into trunk
Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/testtools/2.4
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 102 lines (+37/-9)
3 files modified
NEWS (+15/-0)
testtools/testcase.py (+19/-6)
testtools/tests/test_testtools.py (+3/-3)
To merge this branch: bzr merge lp:~lifeless/testtools/2.4
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+15300@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

2.4. \o/

Revision history for this message
Jonathan Lange (jml) wrote :

Rock and roll.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2009-11-21 19:24:13 +0000
+++ NEWS 2009-11-27 00:50:27 +0000
@@ -1,6 +1,21 @@
1testtools NEWS1testtools NEWS
2==============2==============
33
4NEXT
5~~~~
6
7Changes
8-------
9
10* TestCase.getUniqueString now uses the test id, not the test method name,
11 which works nicer with parameterised tests.
12
13Improvements
14------------
15
16* Python2.4 is now supported again.
17
18
40.9.0190.9.0
5~~~~~20~~~~~
621
722
=== modified file 'testtools/testcase.py'
--- testtools/testcase.py 2009-11-20 00:46:00 +0000
+++ testtools/testcase.py 2009-11-27 00:50:27 +0000
@@ -12,7 +12,10 @@
12 ]12 ]
1313
14from copy import deepcopy14from copy import deepcopy
15import functools15try:
16 from functools import wraps
17except ImportError:
18 wraps = None
16import sys19import sys
17import unittest20import unittest
1821
@@ -228,7 +231,7 @@
228 return self._last_unique_id231 return self._last_unique_id
229232
230 def getUniqueString(self):233 def getUniqueString(self):
231 return '%s-%d' % (self._testMethodName, self.getUniqueInteger())234 return '%s-%d' % (self.id(), self.getUniqueInteger())
232235
233 def _report_error(self, result):236 def _report_error(self, result):
234 self._report_traceback()237 self._report_traceback()
@@ -251,7 +254,13 @@
251 result = self.defaultTestResult()254 result = self.defaultTestResult()
252 result = ExtendedToOriginalDecorator(result)255 result = ExtendedToOriginalDecorator(result)
253 result.startTest(self)256 result.startTest(self)
254 testMethod = getattr(self, self._testMethodName)257 absent_attr = object()
258 # Python 2.5
259 method_name = getattr(self, '_testMethodName', absent_attr)
260 if method_name is absent_attr:
261 # Python 2.4
262 method_name = getattr(self, '_TestCase__testMethodName')
263 testMethod = getattr(self, method_name)
255 try:264 try:
256 try:265 try:
257 self.setUp()266 self.setUp()
@@ -338,9 +347,13 @@
338 @unittest.skip decorator.347 @unittest.skip decorator.
339 """348 """
340 def decorator(test_item):349 def decorator(test_item):
341 @functools.wraps(test_item)350 if wraps is not None:
342 def skip_wrapper(*args, **kwargs):351 @wraps(test_item)
343 raise TestCase.skipException(reason)352 def skip_wrapper(*args, **kwargs):
353 raise TestCase.skipException(reason)
354 else:
355 def skip_wrapper(test_item):
356 test_item.skip(reason)
344 return skip_wrapper357 return skip_wrapper
345 return decorator358 return decorator
346359
347360
=== modified file 'testtools/tests/test_testtools.py'
--- testtools/tests/test_testtools.py 2009-11-19 10:56:58 +0000
+++ testtools/tests/test_testtools.py 2009-11-27 00:50:27 +0000
@@ -491,12 +491,12 @@
491 self.assertEqual(2, two)491 self.assertEqual(2, two)
492492
493 def test_getUniqueString(self):493 def test_getUniqueString(self):
494 # getUniqueString returns the current test name followed by a unique494 # getUniqueString returns the current test id followed by a unique
495 # integer.495 # integer.
496 name_one = self.getUniqueString()496 name_one = self.getUniqueString()
497 self.assertEqual('%s-%d' % (self._testMethodName, 1), name_one)497 self.assertEqual('%s-%d' % (self.id(), 1), name_one)
498 name_two = self.getUniqueString()498 name_two = self.getUniqueString()
499 self.assertEqual('%s-%d' % (self._testMethodName, 2), name_two)499 self.assertEqual('%s-%d' % (self.id(), 2), name_two)
500500
501501
502class TestCloneTestWithNewId(TestCase):502class TestCloneTestWithNewId(TestCase):

Subscribers

People subscribed via source and target branches