Rev 2765: Missed the benchmark suite as something to adjust for the new API. in http://people.ubuntu.com/~robertc/baz2.0/plugin-versions

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugin-versions

------------------------------------------------------------
revno: 2765
revision-id: robertc at robertcollins.net-20070829044331-w6g2kahg2kaa9u9j
parent: robertc at robertcollins.net-20070829015037-5ol4iw1qje4ajdga
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-versions
timestamp: Wed 2007-08-29 14:43:31 +1000
message:
  Missed the benchmark suite as something to adjust for the new API.
modified:
  bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
=== modified file 'bzrlib/benchmarks/__init__.py'
--- a/bzrlib/benchmarks/__init__.py	2007-07-18 20:42:38 +0000
+++ b/bzrlib/benchmarks/__init__.py	2007-08-29 04:43:31 +0000
@@ -18,8 +18,8 @@
 
 from bzrlib import (
     bzrdir,
-    plugin,
     )
+from bzrlib import plugin as _mod_plugin
 import bzrlib.branch
 from bzrlib.tests.TestUtil import TestLoader
 from bzrlib.tests.blackbox import ExternalBase
@@ -197,8 +197,8 @@
     suite = TestLoader().loadTestsFromModuleNames(testmod_names) 
 
     # Load any benchmarks from plugins
-    for name, module in plugin.all_plugins().items():
-        if getattr(module, 'bench_suite', None) is not None:
-            suite.addTest(module.bench_suite())
+    for name, plugin in _mod_plugin.plugins().items():
+        if getattr(plugin.module, 'bench_suite', None) is not None:
+            suite.addTest(plugin.module.bench_suite())
 
     return suite