diff options
| author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2019-02-26 22:33:22 -0500 |
|---|---|---|
| committer | Todd Leonhardt <todd.leonhardt@gmail.com> | 2019-02-26 22:33:22 -0500 |
| commit | eecd1c54a3e731cc38900eab7bca62444eb67279 (patch) | |
| tree | 83752ce309825f0ce33b794aa9a219fb379bbc65 /tests/test_history.py | |
| parent | a3511a69bde151ac8273d71f1b6b720217576f42 (diff) | |
| parent | 7b1b8b10e35b57a813369c9b23876d3615213026 (diff) | |
| download | cmd2-git-eecd1c54a3e731cc38900eab7bca62444eb67279.tar.gz | |
Merged master into history branch and fixed merge conflicts
Diffstat (limited to 'tests/test_history.py')
| -rw-r--r-- | tests/test_history.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_history.py b/tests/test_history.py index 2edb89dc..60ffdb3a 100644 --- a/tests/test_history.py +++ b/tests/test_history.py @@ -221,8 +221,8 @@ def test_history_edit(base_app, monkeypatch): base_app.editor = 'fooedit' # Mock out the os.system call so we don't actually open an editor - m = mock.MagicMock(name='system') - monkeypatch.setattr("os.system", m) + m = mock.MagicMock(name='Popen') + monkeypatch.setattr("subprocess.Popen", m) # Run help command just so we have a command in history run_cmd(base_app, 'help') |