Merge pull request #9214 from nicoddemus/confcutdir-9210
This commit is contained in:
		
						commit
						20a69e11aa
					
				| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Remove incorrect docs about ``confcutdir`` being a configuration option: it can only be set through the ``--confcutdir`` command-line option.
 | 
				
			||||||
| 
						 | 
					@ -1196,19 +1196,8 @@ passed multiple times. The expected format is ``name=value``. For example::
 | 
				
			||||||
   variables, that will be expanded. For more information about cache plugin
 | 
					   variables, that will be expanded. For more information about cache plugin
 | 
				
			||||||
   please refer to :ref:`cache_provider`.
 | 
					   please refer to :ref:`cache_provider`.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
.. confval:: confcutdir
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
   Sets a directory where search upwards for ``conftest.py`` files stops.
 | 
					 | 
				
			||||||
   By default, pytest will stop searching for ``conftest.py`` files upwards
 | 
					 | 
				
			||||||
   from ``pytest.ini``/``tox.ini``/``setup.cfg`` of the project if any,
 | 
					 | 
				
			||||||
   or up to the file-system root.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.. confval:: console_output_style
 | 
					.. confval:: console_output_style
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
   Sets the console output style while running tests:
 | 
					   Sets the console output style while running tests:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   * ``classic``: classic pytest output.
 | 
					   * ``classic``: classic pytest output.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue