diff options
author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2018-09-24 22:04:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-24 22:04:43 -0400 |
commit | 50a40b6845fdf1bd51c90f56ced12af57b083257 (patch) | |
tree | c01bde0052ded1250247930a15022a6d32771274 /tests/test_cmd2.py | |
parent | a75e42a7928f74d8570bf4eec52435d556a83946 (diff) | |
parent | 3c51b9f32d35c05847c302646575dab576430a01 (diff) | |
download | cmd2-git-50a40b6845fdf1bd51c90f56ced12af57b083257.tar.gz |
Merge branch 'master' into colorize
Diffstat (limited to 'tests/test_cmd2.py')
-rw-r--r-- | tests/test_cmd2.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 6b4dddf6..693d5092 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -221,13 +221,13 @@ def test_base_run_pyscript(base_app, capsys, request): out, err = capsys.readouterr() assert out == expected -def test_recursive_pyscript_not_allowed(base_app, capsys, request): +def test_recursive_pyscript_not_allowed(base_app, request): test_dir = os.path.dirname(request.module.__file__) python_script = os.path.join(test_dir, 'scripts', 'recursive.py') - expected = 'ERROR: Recursively entering interactive Python consoles is not allowed.\n' + expected = 'Recursively entering interactive Python consoles is not allowed.' run_cmd(base_app, "pyscript {}".format(python_script)) - out, err = capsys.readouterr() + err = base_app._last_result.stderr assert err == expected def test_pyscript_with_nonexist_file(base_app, capsys): |