mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Incorporated patch 819077, from George Yoshida:

Browse source 
* Fixed typo in docstring for 'failUnlessAlmostEqual()'

* Removed unnecessary use of 'float()' for time values.

* Removed apparently unnecessary import of unittest. At some point in
  the distant past I believe it was necessary otherwise the 'TestCase'
  that a module saw was not the same as the 'TestCase' seen within
  'unittest', and the user's TestCase subclasses were not recognised as
  subclasses of the TestCase seen within unittest. Seems not to be
  necessary now.
This commit is contained in:
Steve Purcell 2003-10-26 10:41:03 +00:00
parent a253e183b8
commit 397b45d4ba
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/unittest.py
View file

@ -46,7 +46,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
__author__ = "Steve Purcell" __author__ = "Steve Purcell"
__email__ = "stephen_purcell at yahoo dot com" __email__ = "stephen_purcell at yahoo dot com"
__version__ = "#Revision: 1.58 $"[11:-2] __version__ = "#Revision: 1.61 $"[11:-2]
import time import time
import sys import sys
@ -329,7 +329,7 @@ class TestCase:
difference rounded to the given number of decimal places difference rounded to the given number of decimal places
(default 7) and comparing to zero. (default 7) and comparing to zero.
Note that decimal places (from zero) is usually not the same Note that decimal places (from zero) are usually not the same
as significant digits (measured from the most signficant digit). as significant digits (measured from the most signficant digit).
""" """
if round(second-first, places) != 0: if round(second-first, places) != 0:
@ -509,19 +509,18 @@ class TestLoader:
for part in parts: for part in parts:
parent, obj = obj, getattr(obj, part) parent, obj = obj, getattr(obj, part)
import unittest
if type(obj) == types.ModuleType: if type(obj) == types.ModuleType:
return self.loadTestsFromModule(obj) return self.loadTestsFromModule(obj)
elif (isinstance(obj, (type, types.ClassType)) and elif (isinstance(obj, (type, types.ClassType)) and
issubclass(obj, unittest.TestCase)): issubclass(obj, TestCase)):
return self.loadTestsFromTestCase(obj) return self.loadTestsFromTestCase(obj)
elif type(obj) == types.UnboundMethodType: elif type(obj) == types.UnboundMethodType:
return parent(obj.__name__) return parent(obj.__name__)
elif isinstance(obj, unittest.TestSuite): elif isinstance(obj, TestSuite):
return obj return obj
elif callable(obj): elif callable(obj):
test = obj() test = obj()
if not isinstance(test, (unittest.TestCase, unittest.TestSuite)): if not isinstance(test, (TestCase, TestSuite)):
raise ValueError, \ raise ValueError, \
"calling %s returned %s, not a test" % (obj,test) "calling %s returned %s, not a test" % (obj,test)
return test return test
@ -674,7 +673,7 @@ class TextTestRunner:
startTime = time.time() startTime = time.time()
test(result) test(result)
stopTime = time.time() stopTime = time.time()
timeTaken = float(stopTime - startTime) timeTaken = stopTime - startTime
result.printErrors() result.printErrors()
self.stream.writeln(result.separator2) self.stream.writeln(result.separator2)
run = result.testsRun run = result.testsRun