[conduit: 111/138] Testy testy testy

[John Carr <johncarr src gnome org>]

commit eec3610a27992c4d499b03c75b449ec5e1ed84fe
Author: John Carr <john carr unrouted co uk>
Date:   Wed May 6 04:17:18 2009 -0700

    Testy testy testy
---
 test/soup/test_dataprovider.py |    2 ++
 test/soup/utils/progressbar.py |   10 ++++++++--
 test/soup/utils/test.py        |    4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/soup/test_dataprovider.py b/test/soup/test_dataprovider.py
index f5291d5..91f03da 100644
--- a/test/soup/test_dataprovider.py
+++ b/test/soup/test_dataprovider.py
@@ -34,10 +34,12 @@ def make_testcase(wrp):
             self.dp.refresh()
             rid = self.dp.put(obj, False, None)
             self.dp.finish(False, False, False)
+            assert self.wrapper.get_num_items() == 1
 
             self.dp.refresh()
             self.dp.put(obj, True, rid.get_UID())
             self.dp.finish(False, False, False)
+            assert self.wrapper.get_num_items() == 1
 
         def test_delete(self):
             """ Should be able to delete items """
diff --git a/test/soup/utils/progressbar.py b/test/soup/utils/progressbar.py
index 8dec04a..de7465c 100644
--- a/test/soup/utils/progressbar.py
+++ b/test/soup/utils/progressbar.py
@@ -16,8 +16,8 @@ class Widget(object):
     def update(self):
         raise NotImplementedError
 
-    def __str__(self):
-        return self.update()
+    def finish(self):
+        return ""
 
 
 class SimpleWidget(Widget):
@@ -37,6 +37,9 @@ class BarWidget(Widget):
         number_of_spaces = progress_space - number_of_frobs
         return self.left + "*" * number_of_frobs + " " * number_of_spaces + self.right
 
+    def finish(self):
+        return "\r%s\r" % (self.pb.term_width * " ")
+
 
 class ProgressBar(object):
 
@@ -62,3 +65,6 @@ class ProgressBar(object):
         self.cur = cur
         self.f.write(self.widget.update() + '\r')
 
+    def finish(self):
+        self.widget.finish()
+
diff --git a/test/soup/utils/test.py b/test/soup/utils/test.py
index 0766aae..62c5820 100644
--- a/test/soup/utils/test.py
+++ b/test/soup/utils/test.py
@@ -132,6 +132,10 @@ class SimpleTestResult(TextTestResult):
     def report_test_start(self, test):
         self.pb.update(self.pb.cur + 1)
 
+    def report_finished(self, timetaken):
+        self.pb.finish()
+        super(SimpleTestResult, self).report_finished(timetaken)
+
 
 class VerboseConsoleTextResult(TextTestResult):