##// END OF EJS Templates
Merge pull request #3734 from jdfreder/file_subdir...
Merge pull request #3734 from jdfreder/file_subdir Nbconvert: Export extracted files into `nbname_files` subdirectory Default build directory changed to . Files extracted from notebook now are placed into a ./notebook_files/ directory by default Spaces added between # symbols and comments It may be best to look at the diffs of the individual commits... The addition of spaces in the comments makes the overall diff hard to read.

File last commit:

r7874:4a6836ce
r11642:321025c8 merge
Show More
test_magics.py
386 lines | 12.7 KiB | text/x-python | PythonLexer
MinRK
split parallel magics tests into own file...
r7055 # -*- coding: utf-8 -*-
"""Test Parallel magics
Authors:
* Min RK
"""
#-------------------------------------------------------------------------------
# Copyright (C) 2011 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.
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Imports
#-------------------------------------------------------------------------------
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 import re
MinRK
split parallel magics tests into own file...
r7055 import sys
import time
import zmq
from nose import SkipTest
from IPython.testing import decorators as dec
from IPython.testing.ipunittest import ParametricTestCase
MinRK
move capture_output util from parallel tests to utils.io
r7324 from IPython.utils.io import capture_output
MinRK
split parallel magics tests into own file...
r7055
from IPython import parallel as pmod
from IPython.parallel import error
from IPython.parallel import AsyncResult
from IPython.parallel.util import interactive
from IPython.parallel.tests import add_engines
MinRK
move capture_output util from parallel tests to utils.io
r7324 from .clienttest import ClusterTestCase, generate_output
MinRK
split parallel magics tests into own file...
r7055
def setup():
add_engines(3, total=True)
class TestParallelMagics(ClusterTestCase, ParametricTestCase):
def test_px_blocking(self):
ip = get_ipython()
v = self.client[-1:]
v.activate()
v.block=True
ip.magic('px a=5')
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], [5])
MinRK
split parallel magics tests into own file...
r7055 ip.magic('px a=10')
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], [10])
MinRK
split parallel magics tests into own file...
r7055 # just 'print a' works ~99% of the time, but this ensures that
# the stdout message has arrived when the result is finished:
with capture_output() as io:
ip.magic(
'px import sys,time;print(a);sys.stdout.flush();time.sleep(0.2)'
)
out = io.stdout
self.assertTrue('[stdout:' in out, out)
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertFalse('\n\n' in out)
MinRK
split parallel magics tests into own file...
r7055 self.assertTrue(out.rstrip().endswith('10'))
self.assertRaisesRemote(ZeroDivisionError, ip.magic, 'px 1/0')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 def _check_generated_stderr(self, stderr, n):
expected = [
r'\[stderr:\d+\]',
'^stderr$',
'^stderr2$',
] * n
self.assertFalse('\n\n' in stderr, stderr)
lines = stderr.splitlines()
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(len(lines), len(expected), stderr)
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 for line,expect in zip(lines, expected):
if isinstance(expect, str):
expect = [expect]
for ex in expect:
self.assertTrue(re.search(ex, line) is not None, "Expected %r in %r" % (ex, line))
MinRK
split parallel magics tests into own file...
r7055 def test_cellpx_block_args(self):
"""%%px --[no]block flags work"""
ip = get_ipython()
v = self.client[-1:]
v.activate()
v.block=False
for block in (True, False):
v.block = block
MinRK
add %pxconfig --[no-]verbose
r7501 ip.magic("pxconfig --verbose")
MinRK
split parallel magics tests into own file...
r7055 with capture_output() as io:
ip.run_cell_magic("px", "", "1")
if block:
self.assertTrue(io.stdout.startswith("Parallel"), io.stdout)
else:
self.assertTrue(io.stdout.startswith("Async"), io.stdout)
with capture_output() as io:
ip.run_cell_magic("px", "--block", "1")
self.assertTrue(io.stdout.startswith("Parallel"), io.stdout)
with capture_output() as io:
ip.run_cell_magic("px", "--noblock", "1")
self.assertTrue(io.stdout.startswith("Async"), io.stdout)
def test_cellpx_groupby_engine(self):
"""%%px --group-outputs=engine"""
ip = get_ipython()
v = self.client[:]
v.block = True
v.activate()
v['generate_output'] = generate_output
with capture_output() as io:
ip.run_cell_magic('px', '--group-outputs=engine', 'generate_output()')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertFalse('\n\n' in io.stdout)
MinRK
add %pxconfig --[no-]verbose
r7501 lines = io.stdout.splitlines()
MinRK
split parallel magics tests into own file...
r7055 expected = [
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[stdout:\d+\]',
'stdout',
MinRK
split parallel magics tests into own file...
r7055 'stdout2',
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[output:\d+\]',
r'IPython\.core\.display\.HTML',
r'IPython\.core\.display\.Math',
r'Out\[\d+:\d+\]:.*IPython\.core\.display\.Math',
MinRK
split parallel magics tests into own file...
r7055 ] * len(v)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(len(lines), len(expected), io.stdout)
MinRK
split parallel magics tests into own file...
r7055 for line,expect in zip(lines, expected):
if isinstance(expect, str):
expect = [expect]
for ex in expect:
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue(re.search(ex, line) is not None, "Expected %r in %r" % (ex, line))
MinRK
split parallel magics tests into own file...
r7055
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self._check_generated_stderr(io.stderr, len(v))
MinRK
split parallel magics tests into own file...
r7055
def test_cellpx_groupby_order(self):
"""%%px --group-outputs=order"""
ip = get_ipython()
v = self.client[:]
v.block = True
v.activate()
v['generate_output'] = generate_output
with capture_output() as io:
ip.run_cell_magic('px', '--group-outputs=order', 'generate_output()')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertFalse('\n\n' in io.stdout)
MinRK
add %pxconfig --[no-]verbose
r7501 lines = io.stdout.splitlines()
MinRK
split parallel magics tests into own file...
r7055 expected = []
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[stdout:\d+\]',
'stdout',
MinRK
split parallel magics tests into own file...
r7055 'stdout2',
] * len(v))
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[output:\d+\]',
MinRK
split parallel magics tests into own file...
r7055 'IPython.core.display.HTML',
] * len(v))
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[output:\d+\]',
MinRK
split parallel magics tests into own file...
r7055 'IPython.core.display.Math',
] * len(v))
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'Out\[\d+:\d+\]:.*IPython\.core\.display\.Math'
MinRK
split parallel magics tests into own file...
r7055 ] * len(v))
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(len(lines), len(expected), io.stdout)
MinRK
split parallel magics tests into own file...
r7055 for line,expect in zip(lines, expected):
if isinstance(expect, str):
expect = [expect]
for ex in expect:
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue(re.search(ex, line) is not None, "Expected %r in %r" % (ex, line))
MinRK
split parallel magics tests into own file...
r7055
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self._check_generated_stderr(io.stderr, len(v))
MinRK
split parallel magics tests into own file...
r7055
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 def test_cellpx_groupby_type(self):
MinRK
split parallel magics tests into own file...
r7055 """%%px --group-outputs=type"""
ip = get_ipython()
v = self.client[:]
v.block = True
v.activate()
v['generate_output'] = generate_output
with capture_output() as io:
ip.run_cell_magic('px', '--group-outputs=type', 'generate_output()')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertFalse('\n\n' in io.stdout)
MinRK
add %pxconfig --[no-]verbose
r7501 lines = io.stdout.splitlines()
MinRK
split parallel magics tests into own file...
r7055
expected = []
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[stdout:\d+\]',
'stdout',
MinRK
split parallel magics tests into own file...
r7055 'stdout2',
] * len(v))
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 r'\[output:\d+\]',
r'IPython\.core\.display\.HTML',
r'IPython\.core\.display\.Math',
MinRK
split parallel magics tests into own file...
r7055 ] * len(v))
expected.extend([
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 (r'Out\[\d+:\d+\]', r'IPython\.core\.display\.Math')
MinRK
split parallel magics tests into own file...
r7055 ] * len(v))
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(len(lines), len(expected), io.stdout)
MinRK
split parallel magics tests into own file...
r7055 for line,expect in zip(lines, expected):
if isinstance(expect, str):
expect = [expect]
for ex in expect:
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue(re.search(ex, line) is not None, "Expected %r in %r" % (ex, line))
MinRK
split parallel magics tests into own file...
r7055
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self._check_generated_stderr(io.stderr, len(v))
MinRK
split parallel magics tests into own file...
r7055
def test_px_nonblocking(self):
ip = get_ipython()
v = self.client[-1:]
v.activate()
v.block=False
ip.magic('px a=5')
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], [5])
MinRK
split parallel magics tests into own file...
r7055 ip.magic('px a=10')
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], [10])
MinRK
add %pxconfig --[no-]verbose
r7501 ip.magic('pxconfig --verbose')
MinRK
split parallel magics tests into own file...
r7055 with capture_output() as io:
MinRK
fix a print statement for py3 in %px test
r7058 ar = ip.magic('px print (a)')
self.assertTrue(isinstance(ar, AsyncResult))
self.assertTrue('Async' in io.stdout)
MinRK
split parallel magics tests into own file...
r7055 self.assertFalse('[stdout:' in io.stdout)
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertFalse('\n\n' in io.stdout)
MinRK
split parallel magics tests into own file...
r7055 ar = ip.magic('px 1/0')
self.assertRaisesRemote(ZeroDivisionError, ar.get)
def test_autopx_blocking(self):
ip = get_ipython()
v = self.client[-1]
v.activate()
v.block=True
with capture_output() as io:
ip.magic('autopx')
ip.run_cell('\n'.join(('a=5','b=12345','c=0')))
ip.run_cell('b*=2')
ip.run_cell('print (b)')
ip.run_cell('b')
ip.run_cell("b/c")
ip.magic('autopx')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 output = io.stdout
MinRK
split parallel magics tests into own file...
r7055
self.assertTrue(output.startswith('%autopx enabled'), output)
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue(output.rstrip().endswith('%autopx disabled'), output)
MinRK
update parallel magic test for exception output with recent change
r7471 self.assertTrue('ZeroDivisionError' in output, output)
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue('\nOut[' in output, output)
MinRK
split parallel magics tests into own file...
r7055 self.assertTrue(': 24690' in output, output)
ar = v.get_result(-1)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], 5)
self.assertEqual(v['b'], 24690)
MinRK
split parallel magics tests into own file...
r7055 self.assertRaisesRemote(ZeroDivisionError, ar.get)
def test_autopx_nonblocking(self):
ip = get_ipython()
v = self.client[-1]
v.activate()
v.block=False
with capture_output() as io:
ip.magic('autopx')
ip.run_cell('\n'.join(('a=5','b=10','c=0')))
ip.run_cell('print (b)')
ip.run_cell('import time; time.sleep(0.1)')
ip.run_cell("b/c")
ip.run_cell('b*=2')
ip.magic('autopx')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 output = io.stdout.rstrip()
MinRK
split parallel magics tests into own file...
r7055
self.assertTrue(output.startswith('%autopx enabled'))
self.assertTrue(output.endswith('%autopx disabled'))
self.assertFalse('ZeroDivisionError' in output)
ar = v.get_result(-2)
self.assertRaisesRemote(ZeroDivisionError, ar.get)
# prevent TaskAborted on pulls, due to ZeroDivisionError
time.sleep(0.5)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['a'], 5)
MinRK
split parallel magics tests into own file...
r7055 # b*=2 will not fire, due to abort
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v['b'], 10)
MinRK
split parallel magics tests into own file...
r7055
def test_result(self):
ip = get_ipython()
v = self.client[-1]
v.activate()
data = dict(a=111,b=222)
v.push(data, block=True)
MinRK
update parallel magics...
r7476 for name in ('a', 'b'):
ip.magic('px ' + name)
MinRK
split parallel magics tests into own file...
r7055 with capture_output() as io:
MinRK
update parallel magics...
r7476 ip.magic('pxresult')
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 output = io.stdout
MinRK
split parallel magics tests into own file...
r7055 msg = "expected %s output to include %s, but got: %s" % \
MinRK
update parallel magics...
r7476 ('%pxresult', str(data[name]), output)
MinRK
split parallel magics tests into own file...
r7055 self.assertTrue(str(data[name]) in output, msg)
@dec.skipif_not_matplotlib
def test_px_pylab(self):
"""%pylab works on engines"""
ip = get_ipython()
v = self.client[-1]
v.block = True
v.activate()
with capture_output() as io:
ip.magic("px %pylab inline")
self.assertTrue("Welcome to pylab" in io.stdout, io.stdout)
self.assertTrue("backend_inline" in io.stdout, io.stdout)
with capture_output() as io:
ip.magic("px plot(rand(100))")
MinRK
aesthetics pass on AsyncResult.display_outputs...
r7239 self.assertTrue('Out[' in io.stdout, io.stdout)
MinRK
split parallel magics tests into own file...
r7055 self.assertTrue('matplotlib.lines' in io.stdout, io.stdout)
MinRK
update parallel magics...
r7476
def test_pxconfig(self):
ip = get_ipython()
rc = self.client
v = rc.activate(-1, '_tst')
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.targets, rc.ids[-1])
MinRK
update parallel magics...
r7476 ip.magic("%pxconfig_tst -t :")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.targets, rc.ids)
MinRK
add a few pxconfig tests
r7485 ip.magic("%pxconfig_tst -t ::2")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.targets, rc.ids[::2])
MinRK
add a few pxconfig tests
r7485 ip.magic("%pxconfig_tst -t 1::2")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.targets, rc.ids[1::2])
MinRK
add a few pxconfig tests
r7485 ip.magic("%pxconfig_tst -t 1")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.targets, 1)
MinRK
update parallel magics...
r7476 ip.magic("%pxconfig_tst --block")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.block, True)
MinRK
update parallel magics...
r7476 ip.magic("%pxconfig_tst --noblock")
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(v.block, False)
MinRK
test %%px --block / --targets
r7484
def test_cellpx_targets(self):
"""%%px --targets doesn't change defaults"""
ip = get_ipython()
rc = self.client
view = rc.activate(rc.ids)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(view.targets, rc.ids)
MinRK
add %pxconfig --[no-]verbose
r7501 ip.magic('pxconfig --verbose')
MinRK
test %%px --block / --targets
r7484 for cell in ("pass", "1/0"):
with capture_output() as io:
try:
ip.run_cell_magic("px", "--targets all", cell)
except pmod.RemoteError:
pass
self.assertTrue('engine(s): all' in io.stdout)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(view.targets, rc.ids)
MinRK
test %%px --block / --targets
r7484
def test_cellpx_block(self):
"""%%px --block doesn't change default"""
ip = get_ipython()
rc = self.client
view = rc.activate(rc.ids)
view.block = False
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(view.targets, rc.ids)
MinRK
add %pxconfig --[no-]verbose
r7501 ip.magic('pxconfig --verbose')
MinRK
test %%px --block / --targets
r7484 for cell in ("pass", "1/0"):
with capture_output() as io:
try:
ip.run_cell_magic("px", "--block", cell)
except pmod.RemoteError:
pass
self.assertFalse('Async' in io.stdout)
self.assertFalse(view.block)
MinRK
split parallel magics tests into own file...
r7055