Merge pytest-dev/pytest@master (#264)

Author: blueyed

changelog/6795.improvement.rst

@@ -0,0 +1 @@
+Import usage error message with invalid `-o` option.

doc/en/_templates/globaltoc.html

@@ -21,3 +21,7 @@ <h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
   <hr>
   {{ toc }}
 {%- endif %}
+
+<hr>
+<a href="{{ pathto('genindex') }}">Index</a>
+<hr>

doc/en/cache.rst

@@ -251,7 +251,7 @@ the cache and nothing will be printed:
     test_caching.py:20: AssertionError
     1 failed in 0.12s
 
-See the :fixture:`cache-api` for more details.
+See the :fixture:`config.cache fixture <config.cache>` for more details.
 
 
 Inspecting Cache content

doc/en/conf.py

@@ -208,7 +208,7 @@
 html_domain_indices = True
 
 # If false, no index is generated.
-html_use_index = False
+html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
 # html_split_index = False

doc/en/plugins.rst

@@ -41,8 +41,7 @@ Here is a little annotated list for some popular plugins:
 * `pytest-instafail <https://pypi.org/project/pytest-instafail/>`_:
   to report failures while the test run is happening.
 
-* `pytest-bdd <https://pypi.org/project/pytest-bdd/>`_ and
-  `pytest-konira <https://pypi.org/project/pytest-konira/>`_
+* `pytest-bdd <https://pypi.org/project/pytest-bdd/>`_:
   to write tests using behaviour-driven testing.
 
 * `pytest-timeout <https://pypi.org/project/pytest-timeout/>`_:

doc/en/reference.rst

@@ -284,7 +284,7 @@ For more details, consult the full :ref:`fixtures docs <fixture>`.
     :decorator:
 
 
-.. fixture:: cache
+.. fixture:: config.cache
 
 config.cache
 ~~~~~~~~~~~~

src/_pytest/config/__init__.py

@@ -1132,7 +1132,11 @@ def _get_override_ini_value(self, name: str) -> Optional[str]:
             try:
                 key, user_ini_value = ini_config.split("=", 1)
             except ValueError:
-                raise UsageError("-o/--override-ini expects option=value style.")
+                raise UsageError(
+                    "-o/--override-ini expects option=value style (got: {!r}).".format(
+                        ini_config
+                    )
+                )
             else:
                 if key == name:
                     value = user_ini_value
@@ -1198,28 +1202,6 @@ def _warn_about_missing_assertion(mode):
             )
 
 
-def setns(obj, dic):
-    import pytest
-
-    for name, value in dic.items():
-        if isinstance(value, dict):
-            mod = getattr(obj, name, None)
-            if mod is None:
-                modname = "pytest.%s" % name
-                mod = types.ModuleType(modname)
-                sys.modules[modname] = mod
-                mod.__all__ = []
-                setattr(obj, name, mod)
-            obj.__all__.append(name)
-            setns(mod, value)
-        else:
-            setattr(obj, name, value)
-            obj.__all__.append(name)
-            # if obj != pytest:
-            #    pytest.__all__.append(name)
-            setattr(pytest, name, value)
-
-
 def create_terminal_writer(config: Config, *args, **kwargs) -> TerminalWriter:
     """Create a TerminalWriter instance configured according to the options
     in the config object. Every code which requires a TerminalWriter object

testing/test_config.py

@@ -1120,8 +1120,12 @@ def test_override_ini_usage_error_bad_style(self, testdir):
             xdist_strict=False
         """
         )
-        result = testdir.runpytest("--override-ini", "xdist_strict True", "-s")
-        result.stderr.fnmatch_lines(["*ERROR* *expects option=value*"])
+        result = testdir.runpytest("--override-ini", "xdist_strict", "True")
+        result.stderr.fnmatch_lines(
+            [
+                "ERROR: -o/--override-ini expects option=value style (got: 'xdist_strict').",
+            ]
+        )
 
     @pytest.mark.parametrize("with_ini", [True, False])
     def test_override_ini_handled_asap(self, testdir, with_ini):

testing/test_session.py

@@ -363,14 +363,6 @@ def test_one():
 
 
 def test_rootdir_wrong_option_arg(testdir):
-    testdir.makepyfile(
-        """
-        import os
-        def test_one():
-            assert 1
-    """
-    )
-
     result = testdir.runpytest("--rootdir=wrong_dir")
     result.stderr.fnmatch_lines(
         ["*Directory *wrong_dir* not found. Check your '--rootdir' option.*"]