5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								efc54b2e56 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-features  
							
							
							
						 
						
							2016-11-11 18:56:53 -02:00  
				
					
						
							
							
								 
						
							
								f2c01c5407 
								
							 
						 
						
							
							
								
								Restore pexpect tests and bypass isalive/wait on macOS. Ref  #2022 .  
							
							
							
						 
						
							2016-10-21 12:36:42 -04:00  
				
					
						
							
							
								 
						
							
								e1674f60e7 
								
							 
						 
						
							
							
								
								remove memocollect anmd memoized_call  
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
				
					
						
							
							
								 
						
							
								4c112401c5 
								
							 
						 
						
							
							
								
								Log LineMatcher output in a stream instead of stderr  
							
							... 
							
							
							
							This makes the match/nomatch output appear as part
of the fnmatch_lines() error on pytest's output instead
of globbered together with general stdout/stderr capture 
							
						 
						
							2016-07-20 22:35:43 -03:00  
				
					
						
							
							
								 
						
							
								944da5b98a 
								
							 
						 
						
							
							
								
								Avoid rewrite warning for inline runs  
							
							... 
							
							
							
							When running pytest inline/inprocess we plugins have already been
imported and re-writen, so avoid the warning. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								e53e45b55c 
								
							 
						 
						
							
							
								
								tests: getexecutable: call `--version` on all Pythons  
							
							... 
							
							
							
							This should prevent errors from pyenv:
    pyenv: python2.6: command not found
    The `python2.6' command exists in these Python versions:
      2.6.9
While the pyenv wrapper explicitly returns 127, I think it is better to
just check for non-zero?! 
							
						 
						
							2016-06-21 08:36:02 +02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								95245b935c 
								
							 
						 
						
							
							
								
								- fix a flaky test on py35-xdist by calling  
							
							... 
							
							
							
							importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors 
							
						 
						
							2015-09-29 13:10:59 +02:00  
				
					
						
							
							
								 
						
							
								e59471766a 
								
							 
						 
						
							
							
								
								Rename "warnings" to "pytest-warnings" in terminal output  
							
							... 
							
							
							
							Fix  #970  
						
							2015-08-27 19:59:52 -03:00  
				
					
						
							
							
								 
						
							
								033def0a7a 
								
							 
						 
						
							
							
								
								Workaround for cmdexec bug on Windows  
							
							... 
							
							
							
							This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows. 
							
						 
						
							2015-07-24 19:24:31 -03:00  
				
					
						
							
							
								 
						
							
								0f52856f99 
								
							 
						 
						
							
							
								
								Use a subdirectory in the TEMP directory to speed up tmpdir creation  
							
							... 
							
							
							
							Fix  #105  
						
							2015-07-15 20:03:58 -03:00  
				
					
						
							
							
								 
						
							
								a7f880fa1f 
								
							 
						 
						
							
							
								
								Make "running" output from testdir.run copy/pastable  
							
							... 
							
							
							
							fix 741
--HG--
branch : issue-741-pytester-output 
							
						 
						
							2015-05-09 10:24:33 -03:00  
				
					
						
							
							
								 
						
							
								d9a44098ce 
								
							 
						 
						
							
							
								
								use new pluggy api (now at 0.3.0) for adding hookcall monitoring  
							
							... 
							
							
							
							and reraise real keyboard interrupts during inline pytest runs
to allow for better stopping of the pytest tests.
--HG--
branch : plug30 
							
						 
						
							2015-05-07 11:02:55 +02:00  
				
					
						
							
							
								 
						
							
								bb8141e27c 
								
							 
						 
						
							
							
								
								- make sure sub pytest runs use the same basetemp  
							
							... 
							
							
							
							- depend on pluggy < 0.3
--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 14:58:46 +02:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								1e883f5979 
								
							 
						 
						
							
							
								
								simplify tracing mechanics by simply going through an indirection  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:15:39 +02:00  
				
					
						
							
							
								 
						
							
								8fde2f98ae 
								
							 
						 
						
							
							
								
								merge default  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-23 12:35:15 +02:00  
				
					
						
							
							
								 
						
							
								e450218daa 
								
							 
						 
						
							
							
								
								Merge _pytest fixture reintroduction from pytest-2.7 branch  
							
							... 
							
							
							
							This was accidentally removed while some plugins depend on it. 
							
						 
						
							2015-04-23 00:55:58 +01:00  
				
					
						
							
							
								 
						
							
								a3aebfaefe 
								
							 
						 
						
							
							
								
								accomodate Floris' comments. (The reason was i just reinstanted the old code :)  
							
							... 
							
							
							
							--HG--
branch : reintroduce_pytest_fixture 
							
						 
						
							2015-04-22 21:04:36 +02:00  
				
					
						
							
							
								 
						
							
								9d5182eaad 
								
							 
						 
						
							
							
								
								reintroduced _pytest fixture of the pytester plugin which is used  
							
							... 
							
							
							
							at least by pytest-xdist.
--HG--
branch : reintroduce_pytest_fixture 
							
						 
						
							2015-04-22 17:06:00 +02:00  
				
					
						
							
							
								 
						
							
								715a235b45 
								
							 
						 
						
							
							
								
								remove shutdown logic from PluginManager and add a add_cleanup() API  
							
							... 
							
							
							
							for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 16:33:20 +02:00  
				
					
						
							
							
								 
						
							
								240cd1f28d 
								
							 
						 
						
							
							
								
								Merge cleaning of sys.modules after pytester.inline_run()  
							
							... 
							
							
							
							Merged in schettino72/pytest/pytester-inline-run-clean-sys-modules
(pull request #278 ). 
							
						 
						
							2015-04-21 11:00:32 +01:00  
				
					
						
							
							
								 
						
							
								bc0ecd1d06 
								
							 
						 
						
							
							
								
								pytester: add method ``TmpTestdir.delete_loaded_modules()``  
							
							... 
							
							
							
							, and call it from ``inline_run()`` to allow temporary modules to be reloaded.
--HG--
branch : pytester-inline-run-clean-sys-modules 
							
						 
						
							2015-04-21 10:18:04 +08:00  
				
					
						
							
							
								 
						
							
								5c8e5acf9d 
								
							 
						 
						
							
							
								
								change test module importing behaviour to append to sys.path  
							
							... 
							
							
							
							instead of prepending.  This better allows to run test modules
against installated versions of a package even if the package
under test has the same import root.  In this example::
   testing/__init__.py
   testing/test_pkg_under_test.py
   pkg_under_test/
the tests will preferrably run against the installed version
of pkg_under_test whereas before they would always pick
up the local version.
--HG--
branch : prefer_installed 
							
						 
						
							2015-04-17 22:25:35 +02:00  
				
					
						
							
							
								 
						
							
								bf0b70aa66 
								
							 
						 
						
							
							
								
								Some docstrings for the pytester plugin  
							
							... 
							
							
							
							These aren't quite complete but are a jolly good start anyway.  It
seems better to commit this now then leave it lingering until it
gets lost. 
							
						 
						
							2015-04-11 17:07:37 +01:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
				
					
						
							
							
								 
						
							
								f5f924d293 
								
							 
						 
						
							
							
								
								- refactor wrapped call support to also accomodate  
							
							... 
							
							
							
							pytest.mark.hookwrapper
- introduce a CallOutcome class to hold the result/excinfo status of
  calling a function.
- rename add_method_controller to add_method_wrapper 
							
						 
						
							2014-10-08 11:27:14 +02:00  
				
					
						
							
							
								 
						
							
								8cfec56a82 
								
							 
						 
						
							
							
								
								simplify internal pytester machinery  
							
							
							
						 
						
							2014-10-06 13:37:57 +02:00  
				
					
						
							
							
								 
						
							
								63f070317c 
								
							 
						 
						
							
							
								
								simplify method to record calls  
							
							
							
						 
						
							2014-10-04 15:49:31 +02:00  
				
					
						
							
							
								 
						
							
								351931d5ca 
								
							 
						 
						
							
							
								
								call scanning of plugins directly, code is shifted from helpconfig.py to core.py  
							
							
							
						 
						
							2014-10-01 12:20:11 +02:00  
				
					
						
							
							
								 
						
							
								5603a0cd4b 
								
							 
						 
						
							
							
								
								Removing py.std usage from _pytest  
							
							
							
						 
						
							2014-07-31 19:13:40 -03:00  
				
					
						
							
							
								 
						
							
								f47ae74981 
								
							 
						 
						
							
							
								
								Make makepyfile accept UTF-8 so a few cookie tests in test_assertrewrite.py  
							
							... 
							
							
							
							don't need to be dedented.
--HG--
branch : makepyfile_utf8 
							
						 
						
							2014-03-28 09:44:18 -07:00  
				
					
						
							
							
								 
						
							
								657a395839 
								
							 
						 
						
							
							
								
								fix comment typos  
							
							
							
						 
						
							2014-01-18 12:39:16 +01:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								1fd1617427 
								
							 
						 
						
							
							
								
								fix pexpect-3.0 compatibility for pytest's own tests.  
							
							... 
							
							
							
							(fixes issue386) 
							
						 
						
							2013-11-19 10:10:27 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								05f6422392 
								
							 
						 
						
							
							
								
								remove unused imports (using "importchecker" project)  
							
							
							
						 
						
							2013-10-02 14:32:40 +02:00  
				
					
						
							
							
								 
						
							
								d226b2faf4 
								
							 
						 
						
							
							
								
								release announcement, bump version numbers, some test adapatations because of random win32 test failures.  
							
							
							
						 
						
							2013-10-01 12:37:11 +02:00  
				
					
						
							
							
								 
						
							
								4b709037ab 
								
							 
						 
						
							
							
								
								some more separation of core pluginmanager from pytest specific functionality.  
							
							... 
							
							
							
							Idea is to have the PluginManager be re-useable from other projects at some point. 
							
						 
						
							2013-09-30 13:14:14 +02:00