##// END OF EJS Templates
Merge pull request #955 from minrk/websocket...
Merge pull request #955 from minrk/websocket Websocket fixes: 1. alert client on failed and lost web socket connections A long message is given if the connection fails within 1s, which assumes the connection did not succeed. Otherwise, it is a short 'connection closed unexpectedly'. This also means that clients are notified on server termination (for better or worse). 2. remove superfluous ws-hostname parameter from notebook This made the notebook server artificially and unnecessarily brittle against tunneling and explicit hostname resolution. Now, the ws_url is defined based on the Origin of the request for the url, so it always matches the http[s] url. This means that it will follow the same tunnel, and the hostname will be already resolved. Resolving the hostname twice makes no sense at all unless the websockets are going to a different server than the http requests. Implemented as a property, so it should still be easy to change for future cases where it might behave differently (e.g. websockets on a different host, or at a non-root url).

File last commit:

r4895:329e2362
r5301:f6b3d8ff merge
Show More
test_autocall.py
45 lines | 971 B | text/x-python | PythonLexer
"""These kinds of tests are less than ideal, but at least they run.
This was an old test that was being run interactively in the top-level tests/
directory, which we are removing. For now putting this here ensures at least
we do run the test, though ultimately this functionality should all be tested
with better-isolated tests that don't rely on the global instance in iptest.
"""
from IPython.utils import py3compat
@py3compat.doctest_refactor_print
def doctest_autocall():
"""
In [1]: def f1(a,b,c):
...: return a+b+c
...:
In [2]: def f2(a):
...: return a + a
...:
In [3]: ;f2 a b c
Out[3]: 'a b ca b c'
In [4]: assert _ == "a b ca b c"
In [5]: ,f1 a b c
Out[5]: 'abc'
In [6]: assert _ == 'abc'
In [7]: print _
abc
In [8]: /f1 1,2,3
Out[8]: 6
In [9]: assert _ == 6
In [10]: /f2 4
Out[10]: 8
In [11]: assert _ == 8
In [11]: del f1, f2
"""