[conduit: 99/138] Ensure each N800 dataprovider has a unique udi, or mapping database chaos will ensue

[John Carr <johncarr src gnome org>]

commit e85a85a67c40115696bd69bd81efebb6b427eeee
Author: John Carr <john carr unrouted co uk>
Date:   Tue May 5 04:04:28 2009 -0700

    Ensure each N800 dataprovider has a unique udi, or mapping database chaos will ensue
---
 test/soup/modules/ipod.py         |    3 ++-
 test/soup/modules/n800.py         |    4 ++--
 test/soup/test_synchronization.py |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/soup/modules/ipod.py b/test/soup/modules/ipod.py
index 7390085..b11f262 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 uuid
 import shutil
 import gpod
 
@@ -19,7 +20,7 @@ class iPodWrapper(object):
     def create_dataprovider(self):
         self.folder = Utils.new_tempdir()
         assert gpod.gpod.itdb_init_ipod(self.folder, "MA450", "Test iPod", None)
-        return self.klass(self.folder, "")
+        return self.klass(self.folder, str(uuid.uuid4()))
 
     def destroy_dataprovider(self):
         shutil.rmtree(self.folder)
diff --git a/test/soup/modules/n800.py b/test/soup/modules/n800.py
index 8a7cda1..a96e5c3 100644
--- a/test/soup/modules/n800.py
+++ b/test/soup/modules/n800.py
@@ -10,7 +10,7 @@ from soup.data.video import VideoWrapper
 import conduit.modules.N800Module.N800Module as N800Module
 import conduit.utils as Utils
 
-import os, shutil
+import os, shutil, uuid
 
 class N800Wrapper(object):
 
@@ -19,7 +19,7 @@ class N800Wrapper(object):
         path = os.path.join(self.folder, self.klass.DEFAULT_FOLDER)
         if not os.path.exists(path):
             os.mkdir(path)
-        return self.klass(self.folder, "")
+        return self.klass(self.folder, str(uuid.uuid4()))
 
     def destroy_dataprovider(self):
         shutil.rmtree(self.folder)
diff --git a/test/soup/test_synchronization.py b/test/soup/test_synchronization.py
index 119c982..680fd2d 100644
--- a/test/soup/test_synchronization.py
+++ b/test/soup/test_synchronization.py
@@ -1,5 +1,7 @@
 import soup
 
+import conduit
+
 def make_testcase(src, src_data, snk, snk_data):
     class TestSynchronization(soup.TestCase):
         source_class = src