conduit r1232 - in trunk: . scripts test/python-tests

[jstowers svn gnome org]

Author: jstowers
Date: Wed Jan 16 11:29:43 2008
New Revision: 1232
URL: http://svn.gnome.org/viewvc/conduit?rev=1232&view=rev

Log:
2008-01-17  John Stowers  <john stowers gmail com>

	* scripts/continuous-tester.sh:
	* test/python-tests/TestDataProviderFacebook.py:
	* test/python-tests/TestDataProviderFlickr.py: Run the non-interactive
	dataprovider tests by default



Modified:
   trunk/ChangeLog
   trunk/scripts/continuous-tester.sh
   trunk/test/python-tests/TestDataProviderFacebook.py
   trunk/test/python-tests/TestDataProviderFlickr.py

Modified: trunk/scripts/continuous-tester.sh
==============================================================================
--- trunk/scripts/continuous-tester.sh	(original)
+++ trunk/scripts/continuous-tester.sh	Wed Jan 16 11:29:43 2008
@@ -3,7 +3,7 @@
 TEST_DIR='/home/john/testing/conduit'
 LOGFILE='/home/john/testing/conduit-test.log'
 SVN_REPO='http://svn.gnome.org/svn/conduit/trunk'
-TEST_OPTIONS='cu'
+TEST_OPTIONS='cuDN'
 SLEEP_TIME='1h'
 
 ME=`basename $0`

Modified: trunk/test/python-tests/TestDataProviderFacebook.py
==============================================================================
--- trunk/test/python-tests/TestDataProviderFacebook.py	(original)
+++ trunk/test/python-tests/TestDataProviderFacebook.py	Wed Jan 16 11:29:43 2008
@@ -20,8 +20,8 @@
 #Send a remote file
 f = File.File("http://files.conduit-project.org/screenshot.png";)
 try:
-    uid = facebook.put(f, True)
-    ok("Upload a photo (UID:%s) " % uid, True)
+    rid = facebook.put(f, True)
+    ok("Upload a photo (%s) " % rid, True)
 except Exception, err:
     ok("Upload a photo (%s)" % err, False)
 

Modified: trunk/test/python-tests/TestDataProviderFlickr.py
==============================================================================
--- trunk/test/python-tests/TestDataProviderFlickr.py	(original)
+++ trunk/test/python-tests/TestDataProviderFlickr.py	Wed Jan 16 11:29:43 2008
@@ -6,7 +6,8 @@
 import conduit.datatypes.File as File
 import conduit.Vfs as Vfs
 
-if not is_online() or not is_interactive():
+#Flickr is non-interactive once you have got a frob for the first time
+if not is_online():
     skip()
 
 #A Reliable photo_id of a photo that will not be deleted