##// END OF EJS Templates
Changed a bunch of modules to NOT have the x permission bit set.
Brian Granger -
Show More
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
@@ -14,16 +14,18 b' __docformat__ = "restructuredtext en"'
14 14 #---------------------------------------------------------------------------
15 15 # Imports
16 16 #---------------------------------------------------------------------------
17 from IPython.kernel.core.interpreter import Interpreter
18 import IPython.kernel.engineservice as es
19 from IPython.testing.util import DeferredTestCase
20 from twisted.internet.defer import succeed
21 17
22 18 try:
19 from IPython.kernel.core.interpreter import Interpreter
20 import IPython.kernel.engineservice as es
21 from IPython.testing.util import DeferredTestCase
22 from twisted.internet.defer import succeed
23 23 from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController
24 24 from Foundation import NSMakeRect
25 25 from AppKit import NSTextView, NSScrollView
26 26 except ImportError:
27 pass
28 else:
27 29 class TestIPythonCocoaControler(DeferredTestCase):
28 30 """Tests for IPythonCocoaController"""
29 31
@@ -28,7 +28,6 b' from zopeinterface import Interface, Attribute, implements, classProvides'
28 28
29 29 from IPython.kernel.core.history import FrontEndHistory
30 30 from IPython.kernel.core.util import Bunch
31 from IPython.kernel.engineservice import IEngineCore
32 31
33 32 ##############################################################################
34 33 # TEMPORARY!!! fake configuration, while we decide whether to use tconfig or
@@ -16,9 +16,14 b' __docformat__ = "restructuredtext en"'
16 16 #---------------------------------------------------------------------------
17 17
18 18 import unittest
19 from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
20 from IPython.frontend import frontendbase
21 from IPython.kernel.engineservice import EngineService
19
20 try:
21 from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
22 from IPython.frontend import frontendbase
23 from IPython.kernel.engineservice import EngineService
24 except ImportError:
25 import nose
26 raise nose.SkipTest("This test requires zope.interface and Twisted")
22 27
23 28 class FrontEndCallbackChecker(AsyncFrontEndBase):
24 29 """FrontEndBase subclass for checking callbacks"""
@@ -28,11 +33,11 b' class FrontEndCallbackChecker(AsyncFrontEndBase):'
28 33 self.updateCalled = False
29 34 self.renderResultCalled = False
30 35 self.renderErrorCalled = False
31
36
32 37 def update_cell_prompt(self, result, blockID=None):
33 38 self.updateCalled = True
34 39 return result
35
40
36 41 def render_result(self, result):
37 42 self.renderResultCalled = True
38 43 return result
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
1 NO CONTENT: modified file chmod 100755 => 100644
@@ -37,8 +37,7 b' try:'
37 37 IEngineSerializedTestCase, \
38 38 IEngineQueuedTestCase
39 39 except ImportError:
40 print "we got an error!!!"
41 raise
40 pass
42 41 else:
43 42 class EngineFCTest(DeferredTestCase,
44 43 IEngineCoreTestCase,
1 NO CONTENT: modified file chmod 100755 => 100644
General Comments 0
You need to be logged in to leave comments. Login now