Fixing misc testing related things.

IPython/frontend/asyncfrontendbase.py

@@ -14,12 +14,13 b' __docformat__ = "restructuredtext en"'
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
-from IPython.external import guid
 
+from IPython.external import guid
 
 from zope.interface import Interface, Attribute, implements, classProvides
 from twisted.python.failure import Failure
-from IPython.frontend.frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
+from IPython.frontend.frontendbase import (
+    FrontEndBase, IFrontEnd, IFrontEndFactory)
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.engineservice import IEngineCore
 

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -15,20 +15,27 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.trial import unittest
+from twisted.internet.defer import succeed
 
-try:
     from IPython.kernel.core.interpreter import Interpreter
     import IPython.kernel.engineservice as es
-    from IPython.testing.util import DeferredTestCase
-    from twisted.internet.defer import succeed
+
+try:
     from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController                                                    
     from Foundation import NSMakeRect
     from AppKit import NSTextView, NSScrollView
 except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted, Foolscap and PyObjC")
+    # This tells twisted.trial to skip this module if PyObjC is not found
+    skip = True
 
-class TestIPythonCocoaControler(DeferredTestCase):
+#---------------------------------------------------------------------------
+# Tests
+#---------------------------------------------------------------------------
+class TestIPythonCocoaControler(unittest.TestCase):
     """Tests for IPythonCocoaController"""
    
     def setUp(self):
@@ -48,19 +55,17 b' class TestIPythonCocoaControler(DeferredTestCase):'
             del result['number']
             del result['id']
             return result
-        self.assertDeferredEquals(
-            self.controller.execute(code).addCallback(removeNumberAndID), 
-            expected)
+        d = self.controller.execute(code)
+        d.addCallback(removeNumberAndID)
+        d.addCallback(lambda r: self.assertEquals(r, expected))
    
     def testControllerMirrorsUserNSWithValuesAsStrings(self):
         code = """userns1=1;userns2=2"""
         def testControllerUserNS(result):
             self.assertEquals(self.controller.userNS['userns1'], 1)
             self.assertEquals(self.controller.userNS['userns2'], 2)
-       
         self.controller.execute(code).addCallback(testControllerUserNS)
    
-   
     def testControllerInstantiatesIEngine(self):
         self.assert_(es.IEngineBase.providedBy(self.controller.engine))
    

IPython/frontend/tests/test_asyncfrontendbase.py

@@ -15,16 +15,14 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-try:
     from twisted.trial import unittest
     from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
     from IPython.frontend import frontendbase 
     from IPython.kernel.engineservice import EngineService
     from IPython.testing.parametric import Parametric, parametric
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):

IPython/frontend/tests/test_process.py

@@ -5,12 +5,12 b' Test process execution and IO redirection.'
 
 __docformat__ = "restructuredtext en"
 
-#-------------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2008-2009  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is
 #  in the file COPYING, distributed as part of this software.
-#-------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 
 from cStringIO import StringIO
 from time import sleep

IPython/kernel/core/tests/test_interpreter.py

@@ -22,6 +22,9 b' from IPython.kernel.core.interpreter import Interpreter'
 # Tests 
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 class TestInterpreter(unittest.TestCase):
 
     def test_unicode(self):

IPython/kernel/core/tests/test_notification.py

@@ -15,6 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                     
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import unittest
 import IPython.kernel.core.notification as notification
 from nose.tools import timed

IPython/kernel/core/tests/test_redirectors.py

@@ -12,12 +12,12 b' __docformat__ = "restructuredtext en"'
 #  in the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-# Stdlib imports
 import os
 from cStringIO import StringIO
 
-# Our own imports
 from IPython.testing import decorators as dec
 
 #-----------------------------------------------------------------------------

IPython/kernel/tests/test_contexts.py

@@ -1,3 +1,6 b''
+# Tell nose to skip this module
+__test__ = {}
+
 #from __future__ import with_statement
 
 # XXX This file is currently disabled to preserve 2.4 compatibility.

IPython/kernel/tests/test_controllerservice.py

@@ -23,15 +23,15 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.application.service import IService
     from IPython.kernel.controllerservice import ControllerService
     from IPython.kernel.tests import multienginetest as met
     from controllertest import IControllerCoreTestCase
     from IPython.testing.util import DeferredTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 class BasicControllerServiceTest(DeferredTestCase,
     IControllerCoreTestCase):

IPython/kernel/tests/test_enginefc.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.python import components
     from twisted.internet import reactor, defer
     from twisted.spread import pb
@@ -36,9 +38,6 b' try:'
         IEngineCoreTestCase, \
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 class EngineFCTest(DeferredTestCase, 

IPython/kernel/tests/test_engineservice.py

@@ -23,7 +23,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from twisted.application.service import IService
     
@@ -34,9 +36,6 b' try:'
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase, \
         IEnginePropertiesTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")    
 
 
 class BasicEngineServiceTest(DeferredTestCase,

IPython/kernel/tests/test_multiengine.py

@@ -15,16 +15,15 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from IPython.testing.util import DeferredTestCase
     from IPython.kernel.controllerservice import ControllerService
     from IPython.kernel import multiengine as me
     from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
         ISynchronousMultiEngineTestCase)
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
  
 class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):

IPython/kernel/tests/test_multienginefc.py

@@ -14,7 +14,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer, reactor
 
     from IPython.kernel.fcutil import Tub, UnauthenticatedTub
@@ -29,9 +31,7 b' try:'
     from IPython.kernel.parallelfunction import ParallelFunction
     from IPython.kernel.error import CompositeError
     from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     
 def _raise_it(f):
     try:

IPython/kernel/tests/test_newserialized.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import zope.interface as zi
     from twisted.trial import unittest
     from IPython.testing.util import DeferredTestCase
@@ -27,9 +29,7 b' try:'
         UnSerialized, \
         SerializeIt, \
         UnSerializeIt
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 #-----------------------------------------------------------------------------
 # Tests

IPython/kernel/tests/test_pendingdeferred.py

@@ -16,7 +16,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from twisted.python import failure
 
@@ -24,9 +26,7 b' try:'
     import IPython.kernel.pendingdeferred as pd
     from IPython.kernel import error
     from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     
 class Foo(object):
 

IPython/kernel/tests/test_task.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import time
 
     from twisted.internet import defer
@@ -25,9 +27,7 b' try:'
     from IPython.kernel.multiengine import IMultiEngine
     from IPython.testing.util import DeferredTestCase
     from IPython.kernel.tests.tasktest import ITaskControllerTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 #-------------------------------------------------------------------------------
 # Tests

IPython/kernel/tests/test_taskfc.py

@@ -14,7 +14,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import time
 
     from twisted.internet import defer, reactor
@@ -32,9 +34,6 b' try:'
     from IPython.kernel.clientconnector import ClientConnector
     from IPython.kernel.error import CompositeError
     from IPython.kernel.parallelfunction import ParallelFunction
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 #-------------------------------------------------------------------------------

IPython/kernel/tests/test_twistedutil.py

@@ -12,6 +12,9 b''
 # Imports
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import tempfile
 import os, sys