[conduit: 76/138] Clean up test folders when tests passed

[John Carr <johncarr src gnome org>]

commit ec9a660837af5bf3375532125b647b54a0ea1dac
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 3 11:02:57 2009 -0700

    Clean up test folders when tests passed
---
 test/soup/modules/folder.py       |    7 ++++++-
 test/soup/modules/ipod.py         |    3 +++
 test/soup/modules/n800.py         |    4 ++++
 test/soup/test_dataprovider.py    |    2 +-
 test/soup/test_synchronization.py |   10 ++++++----
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/test/soup/modules/folder.py b/test/soup/modules/folder.py
index 72f986c..0640dce 100644
--- a/test/soup/modules/folder.py
+++ b/test/soup/modules/folder.py
@@ -4,6 +4,7 @@ from soup.data.file import FileWrapper
 import conduit.modules.FileModule.FileModule as FileModule
 import conduit.utils as Utils
 
+import shutil
 
 class Folder(soup.modules.ModuleWrapper):
 
@@ -11,9 +12,13 @@ class Folder(soup.modules.ModuleWrapper):
     dataclass = FileWrapper
 
     def create_dataprovider(self):
+        self.folder = Utils.new_tempdir()
         dp = self.klass()
         dp.set_configuration({
-            "folder": Utils.new_tempdir(),
+            "folder": self.folder,
         })
         return dp
 
+    def destroy_dataprovider(self):
+        shutil.rmtree(self.folder)
+
diff --git a/test/soup/modules/ipod.py b/test/soup/modules/ipod.py
index f950958..7390085 100644
--- a/test/soup/modules/ipod.py
+++ b/test/soup/modules/ipod.py
@@ -11,6 +11,7 @@ from soup.data.music import MusicWrapper
 import conduit.modules.iPodModule.iPodModule as iPodModule
 import conduit.utils as Utils
 
+import shutil
 import gpod
 
 class iPodWrapper(object):
@@ -20,6 +21,8 @@ class iPodWrapper(object):
         assert gpod.gpod.itdb_init_ipod(self.folder, "MA450", "Test iPod", None)
         return self.klass(self.folder, "")
 
+    def destroy_dataprovider(self):
+        shutil.rmtree(self.folder)
 
 class iPodNote(soup.modules.ModuleWrapper, iPodWrapper):
     klass = iPodModule.IPodNoteTwoWay
diff --git a/test/soup/modules/n800.py b/test/soup/modules/n800.py
index 839459f..173e990 100644
--- a/test/soup/modules/n800.py
+++ b/test/soup/modules/n800.py
@@ -10,12 +10,16 @@ from soup.data.video import VideoWrapper
 import conduit.modules.N800Module.N800Module as N800Module
 import conduit.utils as Utils
 
+import shutil
+
 class N800Wrapper(object):
 
     def create_dataprovider(self):
         self.folder = Utils.new_tempdir()
         return self.klass(self.folder, "")
 
+    def destroy_dataprovider(self):
+        shutil.rmtree(self.folder)
 
 class N800Folder(soup.modules.ModuleWrapper, N800Wrapper):
     klass = N800Module.N800FolderTwoWay
diff --git a/test/soup/test_dataprovider.py b/test/soup/test_dataprovider.py
index 013ac5a..ee1d2c0 100644
--- a/test/soup/test_dataprovider.py
+++ b/test/soup/test_dataprovider.py
@@ -15,7 +15,7 @@ def make_testcase(wrp):
             self.data = self.wrapper.dataclass()
 
         def tearDown(self):
-            self.dp = None
+            self.wrapper.destroy_dataprovider()
 
         def test_add(self):
             """ Should be able to add items """
diff --git a/test/soup/test_synchronization.py b/test/soup/test_synchronization.py
index 846f21c..5dc40f9 100644
--- a/test/soup/test_synchronization.py
+++ b/test/soup/test_synchronization.py
@@ -27,6 +27,12 @@ def make_testcase(src, src_data, snk, snk_data):
             self.pair.set_policy("conflict", "replace")
             self.pair.set_policy("deleted", "replace")
 
+        def tearDown(self):
+            # we always do a no changes sync at the end, and make sure there are no changes...
+            self.pair.sync(block=True)
+            self.source.destroy_dataprovider()
+            self.sink.destroy_dataprovider()
+
         def add_testdata(self, target, target_data):
             count = 0
             for data in target_data.iter_samples():
@@ -45,10 +51,6 @@ def make_testcase(src, src_data, snk, snk_data):
             assert source_count == sink_count, "source has %d, sink has %d, expected %d" % (source_count, sink_count, expected)
             assert source_count == expected
 
-        def tearDown(self):
-            # we always do a no changes sync at the end, and make sure there are no changes...
-            self.pair.sync(block=True)
-
         def test_empty_sync(self):
             """ test empty synchronisation """
             self.pair.sync(block=True)