Merge branch 'master' into history

1 files changed, 19 insertions, 26 deletions

diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 576bdc0c..008f2cc6 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -559,7 +559,6 @@ def test_load_with_binary_file(base_app, capsys, request):
     out, err = capsys.readouterr()
 
     # The load command requires non-empty scripts files
-    assert str(err).startswith("ERROR")
     assert "is not an ASCII or UTF-8 encoded text file" in str(err)
     assert base_app.cmdqueue == []
 
@@ -794,7 +793,7 @@ def test_pipe_to_shell_error(base_app, capsys):
     run_cmd(base_app, 'help | foobarbaz.this_does_not_exist')
     out, err = capsys.readouterr()
     assert not out
-    assert err.startswith("ERROR: Not piping because")
+    assert err.startswith("Not piping because")
 
 
 @pytest.mark.skipif(not clipboard.can_clip,
@@ -2326,16 +2325,16 @@ def test_colors_pouterr_always_tty(mocker, capsys):
     # if colors are on, the output should have some escape sequences in it
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
     # errors always have colors
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_pouterr_always_notty(mocker, capsys):
     app = ColorsApp()
@@ -2348,16 +2347,16 @@ def test_colors_pouterr_always_notty(mocker, capsys):
     # if colors are on, the output should have some escape sequences in it
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
     # errors always have colors
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_terminal_tty(mocker, capsys):
     app = ColorsApp()
@@ -2370,15 +2369,15 @@ def test_colors_terminal_tty(mocker, capsys):
     out, err = capsys.readouterr()
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_terminal_notty(mocker, capsys):
     app = ColorsApp()
@@ -2388,13 +2387,11 @@ def test_colors_terminal_notty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
 def test_colors_never_tty(mocker, capsys):
     app = ColorsApp()
@@ -2404,13 +2401,11 @@ def test_colors_never_tty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
 def test_colors_never_notty(mocker, capsys):
     app = ColorsApp()
@@ -2420,10 +2415,8 @@ def test_colors_never_notty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'