@@ -569,7 +569,6 @@ def test_load_with_binary_file(base_app, capsys, request):
569569 out , err = capsys .readouterr ()
570570
571571 # The load command requires non-empty scripts files
572- assert str (err ).startswith ("ERROR" )
573572 assert "is not an ASCII or UTF-8 encoded text file" in str (err )
574573 assert base_app .cmdqueue == []
575574
@@ -804,7 +803,7 @@ def test_pipe_to_shell_error(base_app, capsys):
804803 run_cmd (base_app , 'help | foobarbaz.this_does_not_exist' )
805804 out , err = capsys .readouterr ()
806805 assert not out
807- assert err .startswith ("ERROR: Not piping because" )
806+ assert err .startswith ("Not piping because" )
808807
809808
810809@pytest .mark .skipif (not clipboard .can_clip ,
@@ -2337,16 +2336,16 @@ def test_colors_pouterr_always_tty(mocker, capsys):
23372336 # if colors are on, the output should have some escape sequences in it
23382337 assert len (out ) > len ('oopsie\n ' )
23392338 assert 'oopsie' in out
2340- assert len (err ) > len ('Error: oopsie\n ' )
2341- assert 'ERROR: oopsie' in err
2339+ assert len (err ) > len ('oopsie\n ' )
2340+ assert 'oopsie' in err
23422341
23432342 # but this one shouldn't
23442343 app .onecmd_plus_hooks ('echo oopsie' )
23452344 out , err = capsys .readouterr ()
23462345 assert out == 'oopsie\n '
23472346 # errors always have colors
2348- assert len (err ) > len ('Error: oopsie\n ' )
2349- assert 'ERROR: oopsie' in err
2347+ assert len (err ) > len ('oopsie\n ' )
2348+ assert 'oopsie' in err
23502349
23512350def test_colors_pouterr_always_notty (mocker , capsys ):
23522351 app = ColorsApp ()
@@ -2359,16 +2358,16 @@ def test_colors_pouterr_always_notty(mocker, capsys):
23592358 # if colors are on, the output should have some escape sequences in it
23602359 assert len (out ) > len ('oopsie\n ' )
23612360 assert 'oopsie' in out
2362- assert len (err ) > len ('Error: oopsie\n ' )
2363- assert 'ERROR: oopsie' in err
2361+ assert len (err ) > len ('oopsie\n ' )
2362+ assert 'oopsie' in err
23642363
23652364 # but this one shouldn't
23662365 app .onecmd_plus_hooks ('echo oopsie' )
23672366 out , err = capsys .readouterr ()
23682367 assert out == 'oopsie\n '
23692368 # errors always have colors
2370- assert len (err ) > len ('Error: oopsie\n ' )
2371- assert 'ERROR: oopsie' in err
2369+ assert len (err ) > len ('oopsie\n ' )
2370+ assert 'oopsie' in err
23722371
23732372def test_colors_terminal_tty (mocker , capsys ):
23742373 app = ColorsApp ()
@@ -2381,15 +2380,15 @@ def test_colors_terminal_tty(mocker, capsys):
23812380 out , err = capsys .readouterr ()
23822381 assert len (out ) > len ('oopsie\n ' )
23832382 assert 'oopsie' in out
2384- assert len (err ) > len ('Error: oopsie\n ' )
2385- assert 'ERROR: oopsie' in err
2383+ assert len (err ) > len ('oopsie\n ' )
2384+ assert 'oopsie' in err
23862385
23872386 # but this one shouldn't
23882387 app .onecmd_plus_hooks ('echo oopsie' )
23892388 out , err = capsys .readouterr ()
23902389 assert out == 'oopsie\n '
2391- assert len (err ) > len ('Error: oopsie\n ' )
2392- assert 'ERROR: oopsie' in err
2390+ assert len (err ) > len ('oopsie\n ' )
2391+ assert 'oopsie' in err
23932392
23942393def test_colors_terminal_notty (mocker , capsys ):
23952394 app = ColorsApp ()
@@ -2399,13 +2398,11 @@ def test_colors_terminal_notty(mocker, capsys):
23992398
24002399 app .onecmd_plus_hooks ('echo_error oopsie' )
24012400 out , err = capsys .readouterr ()
2402- assert out == 'oopsie\n '
2403- assert err == 'ERROR: oopsie\n '
2401+ assert out == err == 'oopsie\n '
24042402
24052403 app .onecmd_plus_hooks ('echo oopsie' )
24062404 out , err = capsys .readouterr ()
2407- assert out == 'oopsie\n '
2408- assert err == 'ERROR: oopsie\n '
2405+ assert out == err == 'oopsie\n '
24092406
24102407def test_colors_never_tty (mocker , capsys ):
24112408 app = ColorsApp ()
@@ -2415,13 +2412,11 @@ def test_colors_never_tty(mocker, capsys):
24152412
24162413 app .onecmd_plus_hooks ('echo_error oopsie' )
24172414 out , err = capsys .readouterr ()
2418- assert out == 'oopsie\n '
2419- assert err == 'ERROR: oopsie\n '
2415+ assert out == err == 'oopsie\n '
24202416
24212417 app .onecmd_plus_hooks ('echo oopsie' )
24222418 out , err = capsys .readouterr ()
2423- assert out == 'oopsie\n '
2424- assert err == 'ERROR: oopsie\n '
2419+ assert out == err == 'oopsie\n '
24252420
24262421def test_colors_never_notty (mocker , capsys ):
24272422 app = ColorsApp ()
@@ -2431,10 +2426,8 @@ def test_colors_never_notty(mocker, capsys):
24312426
24322427 app .onecmd_plus_hooks ('echo_error oopsie' )
24332428 out , err = capsys .readouterr ()
2434- assert out == 'oopsie\n '
2435- assert err == 'ERROR: oopsie\n '
2429+ assert out == err == 'oopsie\n '
24362430
24372431 app .onecmd_plus_hooks ('echo oopsie' )
24382432 out , err = capsys .readouterr ()
2439- assert out == 'oopsie\n '
2440- assert err == 'ERROR: oopsie\n '
2433+ assert out == err == 'oopsie\n '
0 commit comments