jhbuild r2211 - in trunk: . jhbuild/utils tests

[fpeters svn gnome org]

Author: fpeters
Date: Wed Aug 13 14:03:12 2008
New Revision: 2211
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2211&view=rev

Log:
* jhbuild/utils/trayicon.py, tests/mock.py: updated for new check
options, and workaround zenity failing with fake stdin/stdout.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/utils/trayicon.py
   trunk/tests/mock.py

Modified: trunk/jhbuild/utils/trayicon.py
==============================================================================
--- trunk/jhbuild/utils/trayicon.py	(original)
+++ trunk/jhbuild/utils/trayicon.py	Wed Aug 13 14:03:12 2008
@@ -28,7 +28,11 @@
     def __init__(self):
         if not os.environ.get('DISPLAY'):
             return
-        self._run_zenity()
+        try:
+            self._run_zenity()
+        except AttributeError:
+            # 'cStringIO.StringO' object has no attribute 'fileno'
+            pass
 
     def __del__(self):
         if self.proc:

Modified: trunk/tests/mock.py
==============================================================================
--- trunk/tests/mock.py	(original)
+++ trunk/tests/mock.py	Wed Aug 13 14:03:12 2008
@@ -41,6 +41,8 @@
     makedistcheck = False
     nopoison = False
     makecheck_advisory = False
+    module_makecheck = {}
+    forcecheck = False
 
     min_time = None