Rev 36: Clean up the test suite infrastructure, add a version tuple in http://bazaar.launchpad.net/~bzr/bzr-stats/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/~bzr/bzr-stats/trunk

------------------------------------------------------------
revno: 36
revision-id: john at arbash-meinel.com-20100115222117-1nz460o7dt06ahjq
parent: john at arbash-meinel.com-20100115221553-iyks8nuykfk9j2jp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Fri 2010-01-15 16:21:17 -0600
message:
  Clean up the test suite infrastructure, add a version tuple
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2010-01-15 22:15:53 +0000
+++ b/__init__.py	2010-01-15 22:21:17 +0000
@@ -29,8 +29,13 @@
     workingtree,
     )
 from bzrlib.plugins.stats.classify import classify_delta
+""")
+
+from bzrlib import _format_version_tuple
 from itertools import izip
-""")
+
+version_info = (0, 1, 0, 'dev', 0)
+__version__ = _format_version_tuple(version_info)
 
 
 def collapse_by_person(revisions, canonical_committer):
@@ -376,7 +381,8 @@
         revs = repository.get_revisions(ancestry)
         pb = ui.ui_factory.nested_progress_bar()
         try:
-            for i, (rev,delta) in enumerate(izip(revs, repository.get_deltas_for_revisions(revs))):
+            iterator = izip(revs, repository.get_deltas_for_revisions(revs))
+            for i, (rev,delta) in enumerate(iterator):
                 pb.update("analysing revisions", i, len(revs))
                 # Don't count merges
                 if len(rev.parent_ids) > 1:
@@ -428,12 +434,12 @@
 commands.register_command(cmd_credits)
 
 
-def test_suite():
-    from unittest import TestSuite
-    from bzrlib.tests import TestLoader
-    suite = TestSuite()
-    loader = TestLoader()
-    testmod_names = ['test_classify', 'test_stats']
-    suite.addTest(loader.loadTestsFromModuleNames(['%s.%s' % (__name__, i) for i in testmod_names]))
+def load_tests(basic_tests, module, loader):
+    testmod_names = [__name__ + '.' + x for x in [
+        'test_classify',
+        'test_stats',
+        ]]
+    suite = loader.suiteClass()
+    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
     return suite