conduit r1864 - in trunk: . test/python-tests test/python-tests/data

[jstowers svn gnome org]

Author: jstowers
Date: Thu Feb 12 05:54:24 2009
New Revision: 1864
URL: http://svn.gnome.org/viewvc/conduit?rev=1864&view=rev

Log:
2009-02-12  John Stowers  <john stowers gmail com>

	* test/python-tests/TestCoreConvertAudioVideo.py:
	* test/python-tests/data/video.list:
	Clean up test output.



Modified:
   trunk/ChangeLog
   trunk/test/python-tests/TestCoreConvertAudioVideo.py
   trunk/test/python-tests/data/video.list

Modified: trunk/test/python-tests/TestCoreConvertAudioVideo.py
==============================================================================
--- trunk/test/python-tests/TestCoreConvertAudioVideo.py	(original)
+++ trunk/test/python-tests/TestCoreConvertAudioVideo.py	Thu Feb 12 05:54:24 2009
@@ -40,16 +40,16 @@
             if exists:
                 for encoding in test_encodings:
                     args = all_encodings[encoding]
-                    ok("%s: Testing encoding of %s -> %s" % (name,description,encoding), True)
                     
                     to_type = "file/%s?%s" % (name,Utils.encode_conversion_args(args))
                     try:
                         newdata = tc.convert("file",to_type, f)
-                        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)
+                        success = newdata != None and newdata.exists()
+                    except: 
+                        success = False
+
+                    ok("%s: Conversion of %s -> %s" % (name,description,encoding), success, False)
+
     gobject.idle_add(mainloop.quit)
 
 def idle_cb():

Modified: trunk/test/python-tests/data/video.list
==============================================================================
--- trunk/test/python-tests/data/video.list	(original)
+++ trunk/test/python-tests/data/video.list	Thu Feb 12 05:54:24 2009
@@ -6,7 +6,9 @@
 #Note: If two items have the same key, the one in your section replaces
 #the one in the default section
 [DEFAULT]
-ogg=http://files.conduit-project.org/Conduit-0.3.0-screencast-small.ogg
+ogg=http://gstreamer.freedesktop.org/media/small/videotestsrc-720x576-16-15.ogg
+avi=http://samples.mplayerhq.hu/MPEG2/Futurama1-tmp.avi
+flv=http://samples.mplayerhq.hu/FLV/zelda.flv
 
 [john nzjrs-desktop]
 ogg=/home/john/testing/test-data/Conduit-0.3.0-screencast-small.ogg