Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update parallel magic tests with capture_output API #4107

Merged
merged 2 commits into from
Aug 27, 2013
Merged

update parallel magic tests with capture_output API #4107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ef7bf8
update parallel magic tests with capture_output API
minrk Aug 24, 2013
579803c
update parallel magics tests with 2.7 APIs
minrk Aug 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 45 additions & 50 deletions IPython/parallel/tests/test_magics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@ def test_px_blocking(self):
ip.magic(
'px import sys,time;print(a);sys.stdout.flush();time.sleep(0.2)'
)
out = io.stdout
self.assertTrue('[stdout:' in out, out)
self.assertFalse('\n\n' in out)
self.assertTrue(out.rstrip().endswith('10'))
self.assertIn('[stdout:', io.stdout)
self.assertNotIn('\n\n', io.stdout)
assert io.stdout.rstrip().endswith('10')
self.assertRaisesRemote(ZeroDivisionError, ip.magic, 'px 1/0')

def _check_generated_stderr(self, stderr, n):
Expand All @@ -70,14 +69,14 @@ def _check_generated_stderr(self, stderr, n):
'^stderr2$',
] * n

self.assertFalse('\n\n' in stderr, stderr)
self.assertNotIn('\n\n', stderr)
lines = stderr.splitlines()
self.assertEqual(len(lines), len(expected), stderr)
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))
assert re.search(ex, line) is not None, "Expected %r in %r" % (ex, line)

def test_cellpx_block_args(self):
"""%%px --[no]block flags work"""
Expand All @@ -89,20 +88,20 @@ def test_cellpx_block_args(self):
for block in (True, False):
v.block = block
ip.magic("pxconfig --verbose")
with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic("px", "", "1")
if block:
self.assertTrue(io.stdout.startswith("Parallel"), io.stdout)
assert io.stdout.startswith("Parallel"), io.stdout
else:
self.assertTrue(io.stdout.startswith("Async"), io.stdout)
assert io.stdout.startswith("Async"), io.stdout

with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic("px", "--block", "1")
self.assertTrue(io.stdout.startswith("Parallel"), io.stdout)
assert io.stdout.startswith("Parallel"), io.stdout

with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic("px", "--noblock", "1")
self.assertTrue(io.stdout.startswith("Async"), io.stdout)
assert io.stdout.startswith("Async"), io.stdout

def test_cellpx_groupby_engine(self):
"""%%px --group-outputs=engine"""
Expand All @@ -113,10 +112,10 @@ def test_cellpx_groupby_engine(self):

v['generate_output'] = generate_output

with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic('px', '--group-outputs=engine', 'generate_output()')

self.assertFalse('\n\n' in io.stdout)
self.assertNotIn('\n\n', io.stdout)
lines = io.stdout.splitlines()
expected = [
r'\[stdout:\d+\]',
Expand All @@ -133,7 +132,7 @@ def test_cellpx_groupby_engine(self):
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))
assert re.search(ex, line) is not None, "Expected %r in %r" % (ex, line)

self._check_generated_stderr(io.stderr, len(v))

Expand All @@ -147,10 +146,10 @@ def test_cellpx_groupby_order(self):

v['generate_output'] = generate_output

with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic('px', '--group-outputs=order', 'generate_output()')

self.assertFalse('\n\n' in io.stdout)
self.assertNotIn('\n\n', io.stdout)
lines = io.stdout.splitlines()
expected = []
expected.extend([
Expand All @@ -175,7 +174,7 @@ def test_cellpx_groupby_order(self):
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))
assert re.search(ex, line) is not None, "Expected %r in %r" % (ex, line)

self._check_generated_stderr(io.stderr, len(v))

Expand All @@ -188,10 +187,10 @@ def test_cellpx_groupby_type(self):

v['generate_output'] = generate_output

with capture_output() as io:
with capture_output(display=False) as io:
ip.run_cell_magic('px', '--group-outputs=type', 'generate_output()')

self.assertFalse('\n\n' in io.stdout)
self.assertNotIn('\n\n', io.stdout)
lines = io.stdout.splitlines()

expected = []
Expand All @@ -214,7 +213,7 @@ def test_cellpx_groupby_type(self):
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))
assert re.search(ex, line) is not None, "Expected %r in %r" % (ex, line)

self._check_generated_stderr(io.stderr, len(v))

Expand All @@ -232,10 +231,10 @@ def test_px_nonblocking(self):
ip.magic('pxconfig --verbose')
with capture_output() as io:
ar = ip.magic('px print (a)')
self.assertTrue(isinstance(ar, AsyncResult))
self.assertTrue('Async' in io.stdout)
self.assertFalse('[stdout:' in io.stdout)
self.assertFalse('\n\n' in io.stdout)
self.assertIsInstance(ar, AsyncResult)
self.assertIn('Async', io.stdout)
self.assertNotIn('[stdout:', io.stdout)
self.assertNotIn('\n\n', io.stdout)

ar = ip.magic('px 1/0')
self.assertRaisesRemote(ZeroDivisionError, ar.get)
Expand All @@ -246,7 +245,7 @@ def test_autopx_blocking(self):
v.activate()
v.block=True

with capture_output() as io:
with capture_output(display=False) as io:
ip.magic('autopx')
ip.run_cell('\n'.join(('a=5','b=12345','c=0')))
ip.run_cell('b*=2')
Expand All @@ -257,11 +256,11 @@ def test_autopx_blocking(self):

output = io.stdout

self.assertTrue(output.startswith('%autopx enabled'), output)
self.assertTrue(output.rstrip().endswith('%autopx disabled'), output)
self.assertTrue('ZeroDivisionError' in output, output)
self.assertTrue('\nOut[' in output, output)
self.assertTrue(': 24690' in output, output)
assert output.startswith('%autopx enabled'), output
assert output.rstrip().endswith('%autopx disabled'), output
self.assertIn('ZeroDivisionError', output)
self.assertIn('\nOut[', output)
self.assertIn(': 24690', output)
ar = v.get_result(-1)
self.assertEqual(v['a'], 5)
self.assertEqual(v['b'], 24690)
Expand All @@ -284,9 +283,9 @@ def test_autopx_nonblocking(self):

output = io.stdout.rstrip()

self.assertTrue(output.startswith('%autopx enabled'))
self.assertTrue(output.endswith('%autopx disabled'))
self.assertFalse('ZeroDivisionError' in output)
assert output.startswith('%autopx enabled'), output
assert output.endswith('%autopx disabled'), output
self.assertNotIn('ZeroDivisionError', output)
ar = v.get_result(-2)
self.assertRaisesRemote(ZeroDivisionError, ar.get)
# prevent TaskAborted on pulls, due to ZeroDivisionError
Expand All @@ -304,12 +303,9 @@ def test_result(self):

for name in ('a', 'b'):
ip.magic('px ' + name)
with capture_output() as io:
with capture_output(display=False) as io:
ip.magic('pxresult')
output = io.stdout
msg = "expected %s output to include %s, but got: %s" % \
('%pxresult', str(data[name]), output)
self.assertTrue(str(data[name]) in output, msg)
self.assertIn(str(data[name]), io.stdout)

@dec.skipif_not_matplotlib
def test_px_pylab(self):
Expand All @@ -322,13 +318,12 @@ def test_px_pylab(self):
with capture_output() as io:
ip.magic("px %pylab inline")

self.assertTrue("Populating the interactive namespace from numpy and matplotlib" in io.stdout, io.stdout)
self.assertIn("Populating the interactive namespace from numpy and matplotlib", io.stdout)

with capture_output() as io:
with capture_output(display=False) as io:
ip.magic("px plot(rand(100))")

self.assertTrue('Out[' in io.stdout, io.stdout)
self.assertTrue('matplotlib.lines' in io.stdout, io.stdout)
self.assertIn('Out[', io.stdout)
self.assertIn('matplotlib.lines', io.stdout)

def test_pxconfig(self):
ip = get_ipython()
Expand Down Expand Up @@ -356,12 +351,12 @@ def test_cellpx_targets(self):
self.assertEqual(view.targets, rc.ids)
ip.magic('pxconfig --verbose')
for cell in ("pass", "1/0"):
with capture_output() as io:
with capture_output(display=False) as io:
try:
ip.run_cell_magic("px", "--targets all", cell)
except pmod.RemoteError:
pass
self.assertTrue('engine(s): all' in io.stdout)
self.assertIn('engine(s): all', io.stdout)
self.assertEqual(view.targets, rc.ids)


Expand All @@ -374,12 +369,12 @@ def test_cellpx_block(self):
self.assertEqual(view.targets, rc.ids)
ip.magic('pxconfig --verbose')
for cell in ("pass", "1/0"):
with capture_output() as io:
with capture_output(display=False) as io:
try:
ip.run_cell_magic("px", "--block", cell)
except pmod.RemoteError:
pass
self.assertFalse('Async' in io.stdout)
self.assertFalse(view.block)
self.assertNotIn('Async', io.stdout)
self.assertEqual(view.block, False)