summaryrefslogtreecommitdiff
path: root/functional_tests/test_program.py
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-02-17 10:42:47 -0500
committerJohn Szakmeister <john@szakmeister.net>2014-02-20 04:59:21 -0500
commitb65c42fd4e8ade68a5db00d8f089cf3285bd127e (patch)
tree0dfc64116ed49b08c24837c053d72dea9fed1ab9 /functional_tests/test_program.py
parent129bd91e222a0ef973ea962eb539763748b54a84 (diff)
downloadnose-b65c42fd4e8ade68a5db00d8f089cf3285bd127e.tar.gz
Fix #771: attr plugin is broken when parent overrides child method
The issue is when the parent and child have different attributes, and the parent method was being bypassed because of the attribute selection. In this case, Nose would incorrectly use the version from the base class, even though it was supposed to skip the method entirely. To fix this, we need simply need to stop digging through base classes. The dir() method returns a flattened set of methods, so there's no need to iterate through the base classes trying to dig up all the methods. Moreover, it leads to false positives since we were not keeping track of methods seen on the parent classes. As a result, we'd incorrectly select a test for inclusion (using attributes), or we'd pick up a method that we should've ignored (like runTest in a Twisted test case). Thanks to Thomas Grainger for providing a test case!
Diffstat (limited to 'functional_tests/test_program.py')
-rw-r--r--functional_tests/test_program.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/functional_tests/test_program.py b/functional_tests/test_program.py
index b42b371..6ff600d 100644
--- a/functional_tests/test_program.py
+++ b/functional_tests/test_program.py
@@ -113,16 +113,8 @@ class TestTestProgram(unittest.TestCase):
print "-----"
print repr(res)
- # some versions of twisted.trial.unittest.TestCase have
- # runTest in the base class -- this is wrong! But we have
- # to deal with it
- if hasattr(TestCase, 'runTest'):
- expect = 5
- else:
- expect = 4
- self.assertEqual(res.testsRun, expect,
- "Expected to run %s tests, ran %s" %
- (expect, res.testsRun))
+ self.assertEqual(res.testsRun, 4,
+ "Expected to run 4 tests, ran %s" % (res.testsRun,))
assert not res.wasSuccessful()
assert len(res.errors) == 1