summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan McCollam <bmccollam@leapfrogonline.com>2011-11-15 13:59:18 -0600
committerBrendan McCollam <bmccollam@leapfrogonline.com>2011-11-15 13:59:18 -0600
commit7cf359a13abb31f74e3b0b14fb5cbdc18ee7ed93 (patch)
tree47cd441622fca9d34c092fcc1e6924baa55a3d38
parent0300f58e1ccc12fde9e4046dcbd469dde5e7c8f9 (diff)
downloadnose-7cf359a13abb31f74e3b0b14fb5cbdc18ee7ed93.tar.gz
Changing functional_tests/test_defaultpluginmanager.py to support py2.4, 2.5 and Jython
-rw-r--r--functional_tests/test_defaultpluginmanager.py6
-rw-r--r--nosetests.12
2 files changed, 5 insertions, 3 deletions
diff --git a/functional_tests/test_defaultpluginmanager.py b/functional_tests/test_defaultpluginmanager.py
index 09aa992..28c1b86 100644
--- a/functional_tests/test_defaultpluginmanager.py
+++ b/functional_tests/test_defaultpluginmanager.py
@@ -15,6 +15,8 @@ class TestDefaultPluginManager(unittest.TestCase):
pm = DefaultPluginManager()
pm.addPlugins(extraplugins=[OverridesSkip()])
pm.loadPlugins()
- skip_plugin = next(p for p in pm.plugins if p.name == "skip")
- overridden = getattr(skip_plugin, 'is_overridden', False)
+ for plugin in pm.plugins:
+ if plugin.name == "skip":
+ break
+ overridden = getattr(plugin, 'is_overridden', False)
self.assertTrue(overridden)
diff --git a/nosetests.1 b/nosetests.1
index 1ccc461..2438576 100644
--- a/nosetests.1
+++ b/nosetests.1
@@ -491,5 +491,5 @@ jpellerin+nose@gmail.com
.SH COPYRIGHT
LGPL
-.\" Generated by docutils manpage writer on 2011-11-03 16:30.
+.\" Generated by docutils manpage writer on 2011-11-15 13:56.
.\"