summaryrefslogtreecommitdiffstats
path: root/run_tests.py
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-01-21 16:10:26 -0500
committerEd Leafe <ed@leafe.com>2011-01-21 16:10:26 -0500
commit09188c61d5359750f9deadcf912f0fa5fbf005b7 (patch)
tree53006dc213fc28f8c74179516f109c93603f429a /run_tests.py
parent75f93d83be59a85b63a267dc22458a133c591f8e (diff)
parentec60562b1a6d18e6df4024870468c0501dc692f9 (diff)
downloadnova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.gz
nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.xz
nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.zip
Resolved trunk merge conflicts
Diffstat (limited to 'run_tests.py')
-rw-r--r--run_tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py
index 7b5e2192a..5c8436aee 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -60,7 +60,8 @@ class NovaTestRunner(core.TextTestRunner):
if __name__ == '__main__':
c = config.Config(stream=sys.stdout,
env=os.environ,
- verbosity=3)
+ verbosity=3,
+ plugins=core.DefaultPluginManager())
runner = NovaTestRunner(stream=c.stream,
verbosity=c.verbosity,