conduit r1739 - in branches/gnome-2-24: . test/python-tests test/python-tests/data

[jstowers svn gnome org]

Author: jstowers
Date: Sun Oct  5 12:53:35 2008
New Revision: 1739
URL: http://svn.gnome.org/viewvc/conduit?rev=1739&view=rev

Log:
2008-10-05  John Stowers  <john stowers gmail com>

	* test/python-tests/TestCoreConvertAudioVideo.py:
	* test/python-tests/data/folder.list: Fix AudioVideo tests.



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/test/python-tests/TestCoreConvertAudioVideo.py
   branches/gnome-2-24/test/python-tests/data/folder.list

Modified: branches/gnome-2-24/test/python-tests/TestCoreConvertAudioVideo.py
==============================================================================
--- branches/gnome-2-24/test/python-tests/TestCoreConvertAudioVideo.py	(original)
+++ branches/gnome-2-24/test/python-tests/TestCoreConvertAudioVideo.py	Sun Oct  5 12:53:35 2008
@@ -46,8 +46,9 @@
                     ok("%s: Conversion OK" % name, newdata != None and newdata.exists(), False)
                 except Exceptions.ConversionError:
                     ok("%s: Conversion Failed" % name, False, False)
+                except Exception:
+                    ok("GENERAL CONVERSION FAILURE" % name, False, False)
     gobject.idle_add(mainloop.quit)
-    finished()
 
 def idle_cb():
     threading.Thread(target=convert).start()
@@ -55,7 +56,5 @@
 
 gobject.idle_add(idle_cb)
 mainloop.run()
-
-
-
+finished()
 

Modified: branches/gnome-2-24/test/python-tests/data/folder.list
==============================================================================
--- branches/gnome-2-24/test/python-tests/data/folder.list	(original)
+++ branches/gnome-2-24/test/python-tests/data/folder.list	Sun Oct  5 12:53:35 2008
@@ -7,6 +7,8 @@
 #the one in the default section
 [DEFAULT]
 folder=file:///tmp
+removable-volume=file:///media/disk
+ntfs-volume=file:///media/disk
 
 [john nzjrs-desktop]
 removable-volume=file:///media/JRS89