Merge pull request #6856 from chrahunt/maint/remove-unneeded-expect-error-stderr

Remove unnecessary expect_error

Author: cjerdonek

tests/functional/test_check.py

@@ -166,7 +166,7 @@ def test_check_complicated_name_clean(script):
     )
     assert "Successfully installed dependency-b-1.0" in result.stdout
 
-    result = script.pip('check', expect_error=True)
+    result = script.pip('check')
     expected_lines = (
         "No broken requirements found.",
     )

tests/functional/test_completion.py

@@ -65,7 +65,7 @@ def test_completion_alone(script):
     """
     Test getting completion for none shell, just pip completion
     """
-    result = script.pip('completion', expect_error=True)
+    result = script.pip('completion', allow_stderr_error=True)
     assert 'ERROR: You must pass --bash or --fish or --zsh' in result.stderr, \
            'completion alone failed -- ' + result.stderr
 

tests/functional/test_download.py

@@ -21,7 +21,7 @@ def test_download_if_requested(script):
     It should download (in the scratch path) and not install if requested.
     """
     result = script.pip(
-        'download', '-d', 'pip_downloads', 'INITools==0.1', expect_error=True
+        'download', '-d', 'pip_downloads', 'INITools==0.1'
     )
     assert Path('scratch') / 'pip_downloads' / 'INITools-0.1.tar.gz' \
         in result.files_created
@@ -68,7 +68,6 @@ def test_single_download_from_requirements_file(script):
         """))
     result = script.pip(
         'download', '-r', script.scratch_path / 'test-req.txt', '-d', '.',
-        expect_error=True,
     )
     assert Path('scratch') / 'INITools-0.1.tar.gz' in result.files_created
     assert script.site_packages / 'initools' not in result.files_created
@@ -80,7 +79,7 @@ def test_basic_download_should_download_dependencies(script):
     It should download dependencies (in the scratch path)
     """
     result = script.pip(
-        'download', 'Paste[openid]==1.7.5.1', '-d', '.', expect_error=True,
+        'download', 'Paste[openid]==1.7.5.1', '-d', '.'
     )
     assert Path('scratch') / 'Paste-1.7.5.1.tar.gz' in result.files_created
     openid_tarball_prefix = str(Path('scratch') / 'python-openid-')
@@ -129,7 +128,6 @@ def test_download_should_skip_existing_files(script):
 
     result = script.pip(
         'download', '-r', script.scratch_path / 'test-req.txt', '-d', '.',
-        expect_error=True,
     )
     assert Path('scratch') / 'INITools-0.1.tar.gz' in result.files_created
     assert script.site_packages / 'initools' not in result.files_created
@@ -143,7 +141,6 @@ def test_download_should_skip_existing_files(script):
     # only the second package should be downloaded
     result = script.pip(
         'download', '-r', script.scratch_path / 'test-req.txt', '-d', '.',
-        expect_error=True,
     )
     openid_tarball_prefix = str(Path('scratch') / 'python-openid-')
     assert any(
@@ -387,7 +384,6 @@ def test_explicit_platform_only(self, data, script):
             '--dest', '.',
             '--platform', 'linux_x86_64',
             'fake',
-            expect_error=True,
         )
 
 
@@ -571,7 +567,6 @@ def test_download_specify_abi(script, data):
         '--dest', '.',
         '--abi', 'cp27m',
         'fake',
-        expect_error=True,
     )
 
     data.reset()

tests/functional/test_install.py

@@ -262,7 +262,7 @@ def _test_install_editable_from_git(script, tmpdir):
     """Test cloning from Git."""
     pkg_path = _create_test_package(script, name='testpackage', vcs='git')
     args = ['install', '-e', 'git+%s#egg=testpackage' % path_to_url(pkg_path)]
-    result = script.pip(*args, **{"expect_error": True})
+    result = script.pip(*args)
     result.assert_installed('testpackage', with_files=['.git'])
 
 
@@ -331,7 +331,7 @@ def test_basic_install_editable_from_hg(script, tmpdir):
     """Test cloning from Mercurial."""
     pkg_path = _create_test_package(script, name='testpackage', vcs='hg')
     args = ['install', '-e', 'hg+%s#egg=testpackage' % path_to_url(pkg_path)]
-    result = script.pip(*args, **{"expect_error": True})
+    result = script.pip(*args)
     result.assert_installed('testpackage', with_files=['.hg'])
 
 
@@ -342,7 +342,7 @@ def test_vcs_url_final_slash_normalization(script, tmpdir):
     """
     pkg_path = _create_test_package(script, name='testpackage', vcs='hg')
     args = ['install', '-e', 'hg+%s/#egg=testpackage' % path_to_url(pkg_path)]
-    result = script.pip(*args, **{"expect_error": True})
+    result = script.pip(*args)
     result.assert_installed('testpackage', with_files=['.hg'])
 
 
@@ -351,7 +351,7 @@ def test_install_editable_from_bazaar(script, tmpdir):
     """Test checking out from Bazaar."""
     pkg_path = _create_test_package(script, name='testpackage', vcs='bazaar')
     args = ['install', '-e', 'bzr+%s/#egg=testpackage' % path_to_url(pkg_path)]
-    result = script.pip(*args, **{"expect_error": True})
+    result = script.pip(*args)
     result.assert_installed('testpackage', with_files=['.bzr'])
 
 
@@ -1264,8 +1264,8 @@ def test_install_editable_with_wrong_egg_name(script):
               version='0.1')
     """))
     result = script.pip(
-        'install', '--editable', 'file://%s#egg=pkgb' % pkga_path,
-        expect_error=True)
+        'install', '--editable', 'file://%s#egg=pkgb' % pkga_path
+    )
     assert ("Generating metadata for package pkgb produced metadata "
             "for project name pkga. Fix your #egg=pkgb "
             "fragments.") in result.stderr
@@ -1368,7 +1368,7 @@ def test_install_compatible_python_requires(script):
               python_requires='>1.0',
               version='0.1')
     """))
-    res = script.pip('install', pkga_path, expect_error=True)
+    res = script.pip('install', pkga_path)
     assert "Successfully installed pkga-0.1" in res.stdout, res
 
 
@@ -1424,7 +1424,7 @@ def test_install_from_test_pypi_with_ext_url_dep_is_blocked(script, index):
 
 def test_installing_scripts_outside_path_prints_warning(script):
     result = script.pip_install_local(
-        "--prefix", script.scratch_path, "script_wheel1", expect_error=True
+        "--prefix", script.scratch_path, "script_wheel1"
     )
     assert "Successfully installed script-wheel1" in result.stdout, str(result)
     assert "--no-warn-script-location" in result.stderr

tests/functional/test_install_check.py

@@ -31,7 +31,11 @@ def test_check_install_canonicalization(script, deprecated_python):
     # Install the first missing dependency. Only an error for the
     # second dependency should remain.
     result = script.pip(
-        'install', '--no-index', normal_path, '--quiet', expect_error=True
+        'install',
+        '--no-index',
+        normal_path,
+        '--quiet',
+        allow_stderr_error=True,
     )
     expected_lines = [
         "ERROR: pkga 1.0 requires SPECIAL.missing, which is not installed.",
@@ -87,7 +91,7 @@ def test_check_install_does_not_warn_for_out_of_graph_issues(
 
     # Install conflict package
     result = script.pip(
-        'install', '--no-index', pkg_conflict_path, expect_error=True,
+        'install', '--no-index', pkg_conflict_path, allow_stderr_error=True,
     )
     assert matches_expected_lines(result.stderr, [
         "ERROR: broken 1.0 requires missing, which is not installed.",

tests/functional/test_install_cleanup.py

@@ -51,7 +51,6 @@ def test_cleanup_after_install_editable_from_hg(script, tmpdir):
             'hg+https://bitbucket.org/ianb/scripttest',
             tmpdir.joinpath("cache"),
         ),
-        expect_error=True,
     )
     build = script.venv_path / 'build'
     src = script.venv_path / 'src'

tests/functional/test_install_compat.py

@@ -21,7 +21,7 @@ def test_debian_egg_name_workaround(script):
     https://bitbucket.org/ianb/pip/issue/104/pip-uninstall-on-ubuntu-linux
 
     """
-    result = script.pip('install', 'INITools==0.2', expect_error=True)
+    result = script.pip('install', 'INITools==0.2')
 
     egg_info = os.path.join(
         script.site_packages, "INITools-0.2-py%s.egg-info" % pyversion)

tests/functional/test_install_config.py

@@ -74,7 +74,7 @@ def _test_env_vars_override_config_file(script, virtualenv, config_file):
     )
     script.environ['PIP_NO_INDEX'] = '0'
     virtualenv.clear()
-    result = script.pip('install', '-vvv', 'INITools', expect_error=True)
+    result = script.pip('install', '-vvv', 'INITools')
     assert "Successfully installed INITools" in result.stdout
 
 
@@ -89,7 +89,6 @@ def test_command_line_append_flags(script, virtualenv, data):
     result = script.pip(
         'install', '-vvv', 'INITools', '--trusted-host',
         'test.pypi.org',
-        expect_error=True,
     )
     assert (
         "Analyzing links from page https://test.pypi.org"
@@ -99,7 +98,6 @@ def test_command_line_append_flags(script, virtualenv, data):
     result = script.pip(
         'install', '-vvv', '--find-links', data.find_links, 'INITools',
         '--trusted-host', 'test.pypi.org',
-        expect_error=True,
     )
     assert (
         "Analyzing links from page https://test.pypi.org"
@@ -123,7 +121,6 @@ def test_command_line_appends_correctly(script, data):
     result = script.pip(
         'install', '-vvv', 'INITools', '--trusted-host',
         'test.pypi.org',
-        expect_error=True,
     )
 
     assert (
@@ -175,7 +172,6 @@ def _test_config_file_override_stack(script, virtualenv, config_file):
     result = script.pip(
         'install', '-vvv', '--index-url', 'https://pypi.org/simple/',
         'INITools',
-        expect_error=True,
     )
     assert (
         "Getting page http://download.zope.org/ppix/INITools"

tests/functional/test_install_force_reinstall.py

@@ -26,7 +26,7 @@ def check_force_reinstall(script, specifier, expected):
     assert result2.files_updated, 'force-reinstall failed'
     check_installed_version(script, 'simplewheel', expected)
 
-    result3 = script.pip('uninstall', 'simplewheel', '-y', expect_error=True)
+    result3 = script.pip('uninstall', 'simplewheel', '-y')
     assert_all_changes(result, result3, [script.venv / 'build', 'cache'])
 
 

tests/functional/test_install_reqs.py

@@ -534,7 +534,6 @@ def test_install_options_local_to_package(script, data):
         'install',
         '--no-index', '-f', data.find_links,
         '-r', reqs_file,
-        expect_error=True,
     )
 
     simple = test_simple / 'lib' / 'python' / 'simple'