conduit r1210 - in trunk: . test/python-tests

[johncarr svn gnome org]

Author: johncarr
Date: Mon Jan 14 00:02:55 2008
New Revision: 1210
URL: http://svn.gnome.org/viewvc/conduit?rev=1210&view=rev

Log:
Fixes to test suite so that it reflects recent changes in Conduit SVN

Modified:
   trunk/ChangeLog
   trunk/test/python-tests/AutoGenerate.py
   trunk/test/python-tests/AutoSoup.py
   trunk/test/python-tests/common.py

Modified: trunk/test/python-tests/AutoGenerate.py
==============================================================================
--- trunk/test/python-tests/AutoGenerate.py	(original)
+++ trunk/test/python-tests/AutoGenerate.py	Mon Jan 14 00:02:55 2008
@@ -28,18 +28,16 @@
     # Test local <--> local
     test_full_set(host, source, sink, datatype, dataset)
 
-    if datatype in ("contact", "note"):
-        # Test networked <--> local
-        newsource = host.networked_dataprovider(source)
-        test_full_set(host, newsource, sink, datatype, dataset)
+    # Test networked <--> local
+    newsource = host.networked_dataprovider(source)
+    test_full_set(host, newsource, sink, datatype, dataset)
         
-        # Test local <--> networked
-        newsink = host.networked_dataprovider(sink)
-        test_full_set(host, source, newsink, datatype, dataset)
-
-        # Test networked <--> networked
-        test_full_set(host, newsource, newsink, datatype, dataset)
+    # Test local <--> networked
+    newsink = host.networked_dataprovider(sink)
+    test_full_set(host, source, newsink, datatype, dataset)
 
+    # Test networked <--> networked
+    test_full_set(host, newsource, newsink, datatype, dataset)
 except:
     sys.excepthook(*sys.exc_info())
     ok("Unhandled borkage", False)

Modified: trunk/test/python-tests/AutoSoup.py
==============================================================================
--- trunk/test/python-tests/AutoSoup.py	(original)
+++ trunk/test/python-tests/AutoSoup.py	Mon Jan 14 00:02:55 2008
@@ -161,15 +161,15 @@
 #    dp.module.set_configuration( { "sourceURI": opts["conduit-test"], } )
 #    return dp
 
- dataprovider("contact")
-def prep_opensync_evo_contact(host):
-    dp = host.get_dataprovider("OS_Evolution_Contact")
-    dp.module.set_configuration({"source": "Test"})
-    return dp
+# dataprovider("contact")
+#def prep_opensync_evo_contact(host):
+#    dp = host.get_dataprovider("OS_Evolution_Contact")
+#    dp.module.set_configuration({"source": "Test"})
+#    return dp
 
- dataprovider("event")
-def prep_opensync_evo_event(host):
-    dp = host.get_dataprovider("OS_Evolution_Event")
-    dp.module.set_configuration({"source": "Test"})
-    return dp
+# dataprovider("event")
+#def prep_opensync_evo_event(host):
+#    dp = host.get_dataprovider("OS_Evolution_Event")
+#    dp.module.set_configuration({"source": "Test"})
+#    return dp
 

Modified: trunk/test/python-tests/common.py
==============================================================================
--- trunk/test/python-tests/common.py	(original)
+++ trunk/test/python-tests/common.py	Mon Jan 14 00:02:55 2008
@@ -231,9 +231,12 @@
                             ]
 
         self.model = Module.ModuleManager(dirs_to_search)
+        conduit.GLOBALS.moduleManager = self.model
         self.model.load_all()
         self.type_converter = TypeConverter.TypeConverter(self.model)
+        conduit.GLOBALS.typeManager = self.type_converter
         self.sync_manager = Synchronization.SyncManager(self.type_converter)
+        conduit.GLOBALS.syncManager = self.sync_manager
 
         ok("Environment ready", self.model != None and self.type_converter != None and self.sync_manager != None)
 
@@ -292,7 +295,7 @@
             factory = self.model.dataproviderFactories[i]
             if str(factory).find("NetworkServerFactory") != -1:
                 found = True
-                factory.share_dataprovider(conduit, dp)
+                factory.share_dataprovider(dp)
                 break
 
         if found == False: