diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py index 250ca04..b631785 100644 --- a/IPython/core/tests/test_run.py +++ b/IPython/core/tests/test_run.py @@ -138,7 +138,7 @@ class TestMagicRunSimple(tt.TempFileMixin): src = ("class foo: pass\n" "def f(): return foo()") self.mktmp(src) - _ip.magic('run "%s"' % self.fname) + _ip.magic('run %s' % self.fname) _ip.runlines('t = isinstance(f(), foo)') nt.assert_true(_ip.user_ns['t']) diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py index 5f594b0..cc40a99 100644 --- a/IPython/testing/tests/test_tools.py +++ b/IPython/testing/tests/test_tools.py @@ -14,6 +14,7 @@ Tests for testing.tools #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- +from __future__ import with_statement import os import sys @@ -21,7 +22,7 @@ import sys import nose.tools as nt from IPython.testing import decorators as dec -from IPython.testing.tools import full_path, parse_test_output +from IPython.testing import tools as tt #----------------------------------------------------------------------------- # Tests @@ -30,32 +31,44 @@ from IPython.testing.tools import full_path, parse_test_output @dec.skip_win32 def test_full_path_posix(): spath = '/foo/bar.py' - result = full_path(spath,['a.txt','b.txt']) + result = tt.full_path(spath,['a.txt','b.txt']) nt.assert_equal(result, ['/foo/a.txt', '/foo/b.txt']) spath = '/foo' - result = full_path(spath,['a.txt','b.txt']) + result = tt.full_path(spath,['a.txt','b.txt']) nt.assert_equal(result, ['/a.txt', '/b.txt']) - result = full_path(spath,'a.txt') + result = tt.full_path(spath,'a.txt') nt.assert_equal(result, ['/a.txt']) @dec.skip_if_not_win32 def test_full_path_win32(): spath = 'c:\\foo\\bar.py' - result = full_path(spath,['a.txt','b.txt']) + result = tt.full_path(spath,['a.txt','b.txt']) nt.assert_equal(result, ['c:\\foo\\a.txt', 'c:\\foo\\b.txt']) spath = 'c:\\foo' - result = full_path(spath,['a.txt','b.txt']) + result = tt.full_path(spath,['a.txt','b.txt']) nt.assert_equal(result, ['c:\\a.txt', 'c:\\b.txt']) - result = full_path(spath,'a.txt') + result = tt.full_path(spath,'a.txt') nt.assert_equal(result, ['c:\\a.txt']) - + +@dec.parametric def test_parser(): err = ("FAILED (errors=1)", 1, 0) fail = ("FAILED (failures=1)", 0, 1) both = ("FAILED (errors=1, failures=1)", 1, 1) for txt, nerr, nfail in [err, fail, both]: - nerr1, nfail1 = parse_test_output(txt) - yield (nt.assert_equal, nerr, nerr1) - yield (nt.assert_equal, nfail, nfail1) + nerr1, nfail1 = tt.parse_test_output(txt) + yield nt.assert_equal(nerr, nerr1) + yield nt.assert_equal(nfail, nfail1) + + +@dec.parametric +def test_temp_pyfile(): + src = 'pass\n' + fname, fh = tt.temp_pyfile(src) + yield nt.assert_true(os.path.isfile(fname)) + fh.close() + with open(fname) as fh2: + src2 = fh2.read() + yield nt.assert_equal(src2, src)