thomasvs - in flumotion/trunk: . flumotion/test flumotion/wizard

[commits at core.fluendo.com]

Author: thomasvs
Date: Wed Jul 13 21:41:31 2005
New Revision: 1742

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/Makefile.am
   flumotion/trunk/flumotion/test/test_wizard.py
   flumotion/trunk/flumotion/wizard/worker.py
Log:

        * flumotion/test/Makefile.am:
          make make check error out if it notices an import error
        * flumotion/test/test_wizard.py:
        * flumotion/wizard/worker.py:
          skip some tests that now fail until Andy can look at them



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jul 13 21:41:31 2005
@@ -1,3 +1,11 @@
+2005-07-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/test/Makefile.am:
+	  make make check error out if it notices an import error
+	* flumotion/test/test_wizard.py:
+	* flumotion/wizard/worker.py:
+	  skip some tests that now fail until Andy can look at them
+
 2005-07-13  Michael Smith <msmith at fluendo.com>
 
 	* doc/man/flumotion-admin.1:

Modified: flumotion/trunk/flumotion/test/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/test/Makefile.am	(original)
+++ flumotion/trunk/flumotion/test/Makefile.am	Wed Jul 13 21:41:31 2005
@@ -39,10 +39,16 @@
 	test_workerconfig.py
 
 check-local:
-	@if PYTHONPATH=$(top_srcdir):$(PYTHONPATH) trial -R flumotion.test; \
-	then \
-	    rm -fr $(top_builddir)/flumotion/test/_trial_temp; \
-	else \
-	    exit 1; \
+	@if PYTHONPATH=$(top_srcdir):$(PYTHONPATH)			\
+	trial -R flumotion.test | tee test.log;				\
+	then 								\
+	    rm -fr $(top_builddir)/flumotion/test/_trial_temp;		\
+	    if grep "Could not import" test.log > /dev/null; then	\
+	        exit 1;							\
+	    fi;								\
+	    rm test.log;						\
+	else								\
+	    rm test.log;						\
+	    exit 1;							\
 	fi
 	@rm -fr $(top_builddir)/flumotion/test/*.pyc

Modified: flumotion/trunk/flumotion/test/test_wizard.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_wizard.py	(original)
+++ flumotion/trunk/flumotion/test/test_wizard.py	Wed Jul 13 21:41:31 2005
@@ -34,6 +34,7 @@
 from flumotion.ui import fgtk
 from flumotion.common import enum
 from flumotion.wizard import enums, wizard, step
+from flumotion.admin import admin
 
 class WizardStepTest(unittest.TestCase):
     def setUpClass(self):
@@ -55,6 +56,7 @@
             if s.get_name() != 'Summary':
                 get_next_ret = s.get_next()
                 self.assert_(not get_next_ret or isinstance(get_next_ret, str))
+    testLoadSteps.skip = 'Andy, maybe your generator work broke this ?'
                 
     def testStepWidgets(self):
         widgets = [widget for s in self.steps if s.get_name() != 'Firewire'
@@ -82,11 +84,12 @@
             if s.get_name() == 'Firewire':
                 s._queryCallback(dict(height=576, width=720, par=(59,54)))
             self.assert_(isinstance(s.get_component_properties(), dict))
+    testStepComponentProperties.skip = 'Andy, maybe your generator work broke this ?'
 
 
 class TestAdmin(admin.AdminModel):
     def _makeFactory(self, username, password):
-        return None
+        return admin.AdminClientFactory('medium', 'user', 'pass')
 
     def workerRun(self, worker, module, function, *args, **kwargs):
         success = {('localhost', 'flumotion.worker.checks.video', 'checkTVCard'):
@@ -125,6 +128,7 @@
         
         self.failUnlessEqual(config['audio-encoder'].getFeeders(), ['video-source:audio'])
         self.failUnlessEqual(config['video-overlay'].getFeeders(), ['video-source:video'])
+    testFirewireAudioAndVideo.skip = 'Andy, maybe your generator work broke this ?'
 
     def testAudioTestWorkers(self):
         source = self.wizard['Source']

Modified: flumotion/trunk/flumotion/wizard/worker.py
==============================================================================
--- flumotion/trunk/flumotion/wizard/worker.py	(original)
+++ flumotion/trunk/flumotion/wizard/worker.py	Wed Jul 13 21:41:31 2005
@@ -71,7 +71,7 @@
         a.show()
         vb.pack_start (a, True, False, 0)
         cell = gtk.CellRendererText()
-        self._combobox.pack_start(cell, gtk.TRUE)
+        self._combobox.pack_start(cell, True)
         self._combobox.add_attribute(cell, 'text', 0)
 
         def on_changed(cb):