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

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jan 20 01:13:25 2009
New Revision: 1811
URL: http://svn.gnome.org/viewvc/conduit?rev=1811&view=rev

Log:
2009-01-20  John Stowers  <john stowers gmail com>

	* test/python-tests/TestCoreFile.py: Only run the appropriate
	test if CONDUIT_FILE_IMPL is set

	* test/python-tests/TestCoreSettings.py: Only run the appropriate
	test if CONDUIT_SETTINGS_IMPL is set



Modified:
   trunk/ChangeLog
   trunk/test/python-tests/TestCoreFile.py
   trunk/test/python-tests/TestCoreSettings.py

Modified: trunk/test/python-tests/TestCoreFile.py
==============================================================================
--- trunk/test/python-tests/TestCoreFile.py	(original)
+++ trunk/test/python-tests/TestCoreFile.py	Tue Jan 20 01:13:25 2009
@@ -11,9 +11,12 @@
 import datetime
 import tempfile
 
-#for impl in ("GIO",):
-#for impl in ("GnomeVfs",):
-for impl in ("GIO", "GnomeVfs"):
+if os.environ.has_key("CONDUIT_FILE_IMPL"):
+    impls = (os.environ["CONDUIT_FILE_IMPL"],)
+else:
+    impls = ("GIO", "GnomeVfs")
+
+for impl in impls:
     ok("--- TESTING FILE IMPL: %s" % impl, True)
 
     try:

Modified: trunk/test/python-tests/TestCoreSettings.py
==============================================================================
--- trunk/test/python-tests/TestCoreSettings.py	(original)
+++ trunk/test/python-tests/TestCoreSettings.py	Tue Jan 20 01:13:25 2009
@@ -1,10 +1,10 @@
-import os
-
 #common sets up the conduit environment
 from common import *
 
 import conduit.Settings as Settings
 
+import os
+
 #Value not important. Needed to compare TYPES
 SETTINGS = {
         'gui_expanded_rows'         :   [],
@@ -13,7 +13,11 @@
         'default_policy_conflict'   :   "ask"
 }
 
-for impl in ("GConf", "Python"):
+if os.environ.has_key("CONDUIT_SETTINGS_IMPL"):
+    impls = (os.environ["CONDUIT_SETTINGS_IMPL"],)
+else:
+    impls = ("GConf", "Python")
+for impl in impls:
     ok("--- TESTING SETTINGS IMPL: %s" % impl, True)
 
     s = Settings.Settings(implName=impl)