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

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 29 23:41:27 2008
New Revision: 1706
URL: http://svn.gnome.org/viewvc/conduit?rev=1706&view=rev

Log:
	* conduit/Vfs.py:
	* test/python-tests/common.py: XXX_IMPL can now be set via environment
	variables.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/Vfs.py
   trunk/test/python-tests/common.py

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Fri Aug 29 23:41:27 2008
@@ -20,6 +20,8 @@
 FileMonitor     = FileImpl.FileMonitor     
 FolderScanner   = FileImpl.FolderScanner
 
+print FileImpl.FolderScanner
+
 def uri_is_valid(uri):
     """
     Checks if the uri is valid (i.e. not a local path), and its type

Modified: trunk/test/python-tests/common.py
==============================================================================
--- trunk/test/python-tests/common.py	(original)
+++ trunk/test/python-tests/common.py	Fri Aug 29 23:41:27 2008
@@ -17,6 +17,18 @@
 # import main conduit modules
 import conduit
 import conduit.Logging as Logging
+import conduit.Settings as Settings
+
+# set up expected paths & variables 
+conduit.IS_INSTALLED =              False
+conduit.IS_DEVELOPMENT_VERSION =    True
+conduit.SHARED_DATA_DIR =           os.path.join(base_path,"data")
+conduit.SHARED_MODULE_DIR =         os.path.join(base_path,"conduit","modules")
+conduit.FILE_IMPL =                 os.environ.get("CONDUIT_FILE_IMPL","GnomeVfs")
+conduit.BROWSER_IMPL =              os.environ.get("CONDUIT_BROWSER_IMPL","system")
+conduit.SETTINGS_IMPL =             os.environ.get("CONDUIT_SETTINGS_IMPL","GConf")
+conduit.GLOBALS.settings =          Settings.Settings()
+
 import conduit.utils as Utils
 import conduit.Vfs as Vfs
 import conduit.Module as Module
@@ -26,21 +38,12 @@
 import conduit.Conduit as Conduit
 import conduit.SyncSet as SyncSet
 import conduit.MappingDB as MappingDB
-import conduit.Settings as Settings
 
 #import conduit datatypes
 from conduit.datatypes import File, Note, Setting, Contact, Email, Text, Video, Photo, Audio, Event, Bookmark
 from conduit.modules import TestModule
 
-# set up expected paths & variables 
-conduit.IS_INSTALLED =              False
-conduit.IS_DEVELOPMENT_VERSION =    True
-conduit.SHARED_DATA_DIR =           os.path.join(base_path,"data")
-conduit.SHARED_MODULE_DIR =         os.path.join(base_path,"conduit","modules")
-conduit.FILE_IMPL =                 "GnomeVfs"  
-conduit.BROWSER_IMPL =              "system"
-conduit.SETTINGS_IMPL =             "GConf"
-conduit.GLOBALS.settings =          Settings.Settings()
+
 
 def is_online():
     try: