6af2abdb53 
								
							 
						 
						
							
							
								
								Fixed flake8 warnings  
							
							... 
							
							
							
							W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								ba9a76fdb3 
								
							 
						 
						
							
							
								
								Provides encoding attribute on CaptureIO  
							
							... 
							
							
							
							Fix  #2375  
						
							2017-07-16 14:29:00 +02:00  
				
					
						
							
							
								 
						
							
								e5169a026a 
								
							 
						 
						
							
							
								
								#2574 : --fixtures, --fixtures-per-test keep indentation of docstring  
							
							
							
						 
						
							2017-07-15 13:33:11 +02:00  
				
					
						
							
							
								 
						
							
								97fdc9a7fe 
								
							 
						 
						
							
							
								
								Ensure final collected line doesn't include artifacts  
							
							... 
							
							
							
							We sometimes would see the following line:
collected 1 item s
just because previous write to the terminal includes number of
characters greater than 'collected 1 item'. 
							
						 
						
							2017-07-13 12:11:20 -07:00  
				
					
						
							
							
								 
						
							
								771cedd3da 
								
							 
						 
						
							
							
								
								Merge pull request  #2567  from nicoddemus/add-report-section-docs  
							
							... 
							
							
							
							Add docs for Item.add_report_section in the docs 
							
						 
						
							2017-07-13 10:55:03 +02:00  
				
					
						
							
							
								 
						
							
								81cec9f5e3 
								
							 
						 
						
							
							
								
								Merge pull request  #2563  from pv/yield-warn-spam  
							
							... 
							
							
							
							Make YIELD_TEST warning less spammy 
							
						 
						
							2017-07-13 10:45:46 +02:00  
				
					
						
							
							
								 
						
							
								1485a3a902 
								
							 
						 
						
							
							
								
								Merge pull request  #2566  from jmsdvl/iss2518  
							
							... 
							
							
							
							Detect and warn/ignore local python installations 
							
						 
						
							2017-07-13 10:44:04 +02:00  
				
					
						
							
							
								 
						
							
								67fca04050 
								
							 
						 
						
							
							
								
								update docs and note; add virtualenv collection tests  
							
							
							
						 
						
							2017-07-11 23:14:38 -05:00  
				
					
						
							
							
								 
						
							
								73b07e1439 
								
							 
						 
						
							
							
								
								Add docs for Item.add_report_section in the docs  
							
							... 
							
							
							
							Fix  #2381  
						
							2017-07-11 21:45:27 -03:00  
				
					
						
							
							
								 
						
							
								b32cfc88da 
								
							 
						 
						
							
							
								
								use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv  
							
							
							
						 
						
							2017-07-11 14:32:09 -05:00  
				
					
						
							
							
								 
						
							
								676c4f970d 
								
							 
						 
						
							
							
								
								trim trailing ws  
							
							
							
						 
						
							2017-07-11 13:31:11 -05:00  
				
					
						
							
							
								 
						
							
								89c73582ca 
								
							 
						 
						
							
							
								
								ignore the active python installation unless told otherwise  
							
							
							
						 
						
							2017-07-11 11:52:16 -05:00  
				
					
						
							
							
								 
						
							
								d9aaab7ab2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-07-10 17:51:59 -03:00  
				
					
						
							
							
								 
						
							
								8a7d98fed9 
								
							 
						 
						
							
							
								
								Make YIELD_TEST warning less spammy  
							
							... 
							
							
							
							Emit it only once per each generator, rather than for each generated
function. Also add information about which test caused it to be emitted. 
							
						 
						
							2017-07-10 21:41:09 +02:00  
				
					
						
							
							
								 
						
							
								80595115b0 
								
							 
						 
						
							
							
								
								replace all _escape_strings to _ascii_escaped  
							
							
							
						 
						
							2017-07-10 12:32:27 -05:00  
				
					
						
							
							
								 
						
							
								f471eef661 
								
							 
						 
						
							
							
								
								ini option cache_dir  
							
							
							
						 
						
							2017-07-07 13:07:06 +03:00  
				
					
						
							
							
								 
						
							
								ef62b86335 
								
							 
						 
						
							
							
								
								Merge pull request  #2492  from kalekundert/features  
							
							... 
							
							
							
							Add support for numpy arrays (and dicts) to approx. 
							
						 
						
							2017-07-06 11:46:51 +02:00  
				
					
						
							
							
								 
						
							
								7cd03d7611 
								
							 
						 
						
							
							
								
								Merge pull request  #2554  from nicoddemus/pytest-configure-order  
							
							... 
							
							
							
							Clarify pytest_configure hook call order 
							
						 
						
							2017-07-05 14:22:55 +02:00  
				
					
						
							
							
								 
						
							
								3667086acc 
								
							 
						 
						
							
							
								
								Clarify pytest_configure hook call order  
							
							... 
							
							
							
							Fix  #2539  
						
							2017-07-05 07:50:59 -03:00  
				
					
						
							
							
								 
						
							
								221f42c5ce 
								
							 
						 
						
							
							
								
								Change --strict help message to clarify it deals with unregistered markers  
							
							... 
							
							
							
							Fix  #2444  
						
							2017-07-04 20:14:57 -03:00  
				
					
						
							
							
								 
						
							
								7a1a439049 
								
							 
						 
						
							
							
								
								Use `cls` instead of `ApproxNumpyBase`.  
							
							... 
							
							
							
							Slightly more general, probably doesn't make a difference. 
							
						 
						
							2017-07-04 09:20:52 -07:00  
				
					
						
							
							
								 
						
							
								b62aef3372 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2017-07-04 12:44:58 -03:00  
				
					
						
							
							
								 
						
							
								c111e9dac3 
								
							 
						 
						
							
							
								
								Avoid making multiple ApproxNumpy types.  
							
							
							
						 
						
							2017-07-03 22:45:24 -07:00  
				
					
						
							
							
								 
						
							
								8524a57075 
								
							 
						 
						
							
							
								
								Add "approx" to all the repr-strings.  
							
							
							
						 
						
							2017-07-03 22:44:37 -07:00  
				
					
						
							
							
								 
						
							
								6908d93ba1 
								
							 
						 
						
							
							
								
								Merge pull request  #2475  from ant31/master  
							
							... 
							
							
							
							[wip] Fix ignore_path condition 
							
						 
						
							2017-07-03 18:57:17 -03:00  
				
					
						
							
							
								 
						
							
								9b9fede5be 
								
							 
						 
						
							
							
								
								allow staticmethods to be detected as test functions  
							
							... 
							
							
							
							Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there. 
							
						 
						
							2017-06-29 07:44:36 -04:00  
				
					
						
							
							
								 
						
							
								9b51fc646c 
								
							 
						 
						
							
							
								
								Merge pull request  #2526  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2017-06-24 11:25:35 +02:00  
				
					
						
							
							
								 
						
							
								16df4da1f7 
								
							 
						 
						
							
							
								
								Fix exclude_path check  
							
							
							
						 
						
							2017-06-24 10:58:47 +02:00  
				
					
						
							
							
								 
						
							
								3de93657bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-06-24 00:47:48 -03:00  
				
					
						
							
							
								 
						
							
								0d0b01bded 
								
							 
						 
						
							
							
								
								introduce deprecation warnings for legacy parametersets,  fixes   #2427  
							
							
							
						 
						
							2017-06-23 22:06:49 +02:00  
				
					
						
							
							
								 
						
							
								8d5f2872d3 
								
							 
						 
						
							
							
								
								minor code style fix  
							
							
							
						 
						
							2017-06-23 11:59:03 +02:00  
				
					
						
							
							
								 
						
							
								23d016f114 
								
							 
						 
						
							
							
								
								address review comments  
							
							... 
							
							
							
							* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo 
							
						 
						
							2017-06-23 11:05:38 +02:00  
				
					
						
							
							
								 
						
							
								22b7701431 
								
							 
						 
						
							
							
								
								Merge pull request  #2480  from nicoddemus/issue-2469-deprecated-call-ctx  
							
							... 
							
							
							
							deprecated_call context manager captures warnings already raised 
							
						 
						
							2017-06-22 10:53:28 -03:00  
				
					
						
							
							
								 
						
							
								1d926011a4 
								
							 
						 
						
							
							
								
								add deprecation warnings for using markinfo attributes  
							
							
							
						 
						
							2017-06-22 15:12:50 +02:00  
				
					
						
							
							
								 
						
							
								ff8dbd0ad8 
								
							 
						 
						
							
							
								
								Add tracebackhide to function call form of deprecated_call  
							
							
							
						 
						
							2017-06-22 08:54:39 -03:00  
				
					
						
							
							
								 
						
							
								5e832017d5 
								
							 
						 
						
							
							
								
								Merge pull request  #2487  from nicoddemus/recursion-error-2486  
							
							... 
							
							
							
							Fix internal error when trying to detect the start of a recursive traceback 
							
						 
						
							2017-06-22 13:40:32 +02:00  
				
					
						
							
							
								 
						
							
								19b12b22e7 
								
							 
						 
						
							
							
								
								store pristine marks on function.pytestmark  
							
							... 
							
							
							
							fixes  #2516  
						
							2017-06-22 10:48:45 +02:00  
				
					
						
							
							
								 
						
							
								64ae6ae25d 
								
							 
						 
						
							
							
								
								extract application of marks and legacy markinfos  
							
							
							
						 
						
							2017-06-22 10:41:28 +02:00  
				
					
						
							
							
								 
						
							
								bdec2c8f9e 
								
							 
						 
						
							
							
								
								move marker transfer to _pytest.mark  
							
							
							
						 
						
							2017-06-22 08:45:10 +02:00  
				
					
						
							
							
								 
						
							
								9597e674d9 
								
							 
						 
						
							
							
								
								Use sets to compare dictionary keys.  
							
							
							
						 
						
							2017-06-16 08:25:13 -07:00  
				
					
						
							
							
								 
						
							
								4d02863b16 
								
							 
						 
						
							
							
								
								Remove a dict-comprehension.  
							
							... 
							
							
							
							Not compatible with python26. 
							
						 
						
							2017-06-15 18:56:09 -07:00  
				
					
						
							
							
								 
						
							
								50769557e8 
								
							 
						 
						
							
							
								
								Skip the numpy doctests.  
							
							... 
							
							
							
							They seem like more trouble that they're worth. 
							
						 
						
							2017-06-15 14:53:27 -07:00  
				
					
						
							
							
								 
						
							
								8badb47db6 
								
							 
						 
						
							
							
								
								Implement suggestions from code review.  
							
							... 
							
							
							
							- Avoid importing numpy unless necessary.
- Mention numpy arrays and dictionaries in the docs.
- Add numpy to the list of tox dependencies.
- Don't unnecessarily copy arrays or allocate empty space for them.
- Use code from compat.py rather than writing py2/3 versions of things
  myself.
- Avoid reimplementing __repr__ for built-in types.
- Add an option to consider NaN == NaN, because sometimes people use NaN
  to mean "missing data". 
							
						 
						
							2017-06-15 09:19:10 -07:00  
				
					
						
							
							
								 
						
							
								4e57a39067 
								
							 
						 
						
							
							
								
								Merge pull request  #2468  from nicoddemus/collection-report-2464  
							
							... 
							
							
							
							Fix incorrect "collected items" report when specifying tests on the command-line 
							
						 
						
							2017-06-14 10:57:57 +02:00  
				
					
						
							
							
								 
						
							
								af0344e940 
								
							 
						 
						
							
							
								
								Merge pull request  #2500  from nicoddemus/issue-2434-doctest-modules  
							
							... 
							
							
							
							Fix decode error in Python 2 for doctests in docstrings 
							
						 
						
							2017-06-14 05:52:44 +02:00  
				
					
						
							
							
								 
						
							
								97367cf773 
								
							 
						 
						
							
							
								
								Remove obsolete comment from rewrite.py  
							
							... 
							
							
							
							This was made obsolete by 021e843427 
							
						 
						
							2017-06-13 23:12:33 -03:00  
				
					
						
							
							
								 
						
							
								336cf3e1f5 
								
							 
						 
						
							
							
								
								Merge pull request  #2496  from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions  
							
							... 
							
							
							
							Handle exceptions in subrequest finalizers 
							
						 
						
							2017-06-13 23:03:03 -03:00  
				
					
						
							
							
								 
						
							
								4e4ebbef5a 
								
							 
						 
						
							
							
								
								Improve test to ensure the expected function is re-raised  
							
							
							
						 
						
							2017-06-13 20:16:48 -03:00  
				
					
						
							
							
								 
						
							
								b09d60c60a 
								
							 
						 
						
							
							
								
								Fix decode error in Python 2 for doctests in docstrings  
							
							... 
							
							
							
							Fix  #2434  
						
							2017-06-13 19:41:34 -03:00  
				
					
						
							
							
								 
						
							
								21137cf8c5 
								
							 
						 
						
							
							
								
								Add firstresult=True to the hook docs  
							
							
							
						 
						
							2017-06-12 19:45:35 -07:00  
				
					
						
							
							
								 
						
							
								5a856b6e29 
								
							 
						 
						
							
							
								
								handle and reraise subrequest finalizer exceptions  
							
							
							
						 
						
							2017-06-12 21:26:42 -04:00  
				
					
						
							
							
								 
						
							
								8c22aee256 
								
							 
						 
						
							
							
								
								Resolve merge conflict due to approx being moved.  
							
							
							
						 
						
							2017-06-11 19:46:59 -07:00  
				
					
						
							
							
								 
						
							
								9f3122fec6 
								
							 
						 
						
							
							
								
								Add support for numpy arrays (and dicts) to approx.  
							
							... 
							
							
							
							This fixes  #1994 .  It turned out to require a lot of refactoring because
subclassing numpy.ndarray was necessary to coerce python into calling
the right `__eq__` operator. 
							
						 
						
							2017-06-11 19:27:41 -07:00  
				
					
						
							
							
								 
						
							
								6be57a3711 
								
							 
						 
						
							
							
								
								move python api helpers out of the python module  
							
							... 
							
							
							
							this separates exposed normal api from collection elements 
							
						 
						
							2017-06-11 12:27:16 +02:00  
				
					
						
							
							
								 
						
							
								36251e0db4 
								
							 
						 
						
							
							
								
								move approx to own file  
							
							
							
						 
						
							2017-06-11 12:15:30 +02:00  
				
					
						
							
							
								 
						
							
								8bb589fc5d 
								
							 
						 
						
							
							
								
								Fix internal error when trying to detect the start of a recursive traceback.  
							
							... 
							
							
							
							Fix  #2486  
						
							2017-06-09 19:26:26 -03:00  
				
					
						
							
							
								 
						
							
								917b9a8352 
								
							 
						 
						
							
							
								
								Merge pull request  #2476  from nicoddemus/fix-2459-numpy-comparison  
							
							... 
							
							
							
							Fix internal error when a recursion error occurs and frames contain objects that can't be compared 
							
						 
						
							2017-06-07 20:34:36 +02:00  
				
					
						
							
							
								 
						
							
								2127a2378a 
								
							 
						 
						
							
							
								
								Fix internal error with recursive tracebacks with that frames contain objects that can't be compared  
							
							... 
							
							
							
							Fix  #2459  
						
							2017-06-07 14:40:13 -03:00  
				
					
						
							
							
								 
						
							
								d2db6626cf 
								
							 
						 
						
							
							
								
								Merge pull request  #2466  from nicoddemus/remove-unicode-warning  
							
							... 
							
							
							
							Remove UnicodeWarning from pytest warnings 
							
						 
						
							2017-06-07 08:00:36 +02:00  
				
					
						
							
							
								 
						
							
								620ba5971f 
								
							 
						 
						
							
							
								
								deprecated_call context manager captures warnings already raised  
							
							... 
							
							
							
							Fix  #2469  
						
							2017-06-06 22:40:04 -03:00  
				
					
						
							
							
								 
						
							
								54a90e9555 
								
							 
						 
						
							
							
								
								docs: Create links for objects to show the api  
							
							
							
						 
						
							2017-06-06 01:10:32 +02:00  
				
					
						
							
							
								 
						
							
								9d41eaedbf 
								
							 
						 
						
							
							
								
								Issue UnicodeWarning only for non-ascii unicode  
							
							... 
							
							
							
							Fix  #2463  
						
							2017-06-05 10:43:15 -03:00  
				
					
						
							
							
								 
						
							
								46d157fe07 
								
							 
						 
						
							
							
								
								Fix collection report when collecting a single test item  
							
							
							
						 
						
							2017-06-03 20:39:53 -03:00  
				
					
						
							
							
								 
						
							
								87e4a28351 
								
							 
						 
						
							
							
								
								Fix incorrect collected items report when specifying tests on the command-line  
							
							... 
							
							
							
							Fix  #2464  
						
							2017-06-03 20:39:53 -03:00  
				
					
						
							
							
								 
						
							
								59b3693988 
								
							 
						 
						
							
							
								
								Fixed wrong if in the WindowsConsoleIO workaround  
							
							
							
						 
						
							2017-06-02 12:34:26 +03:00  
				
					
						
							
							
								 
						
							
								05796be21a 
								
							 
						 
						
							
							
								
								A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture  
							
							... 
							
							
							
							Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.
The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.
The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".
See https://github.com/pytest-dev/py/issues/103  
							
						 
						
							2017-06-02 11:19:03 +03:00  
				
					
						
							
							
								 
						
							
								9abff7f72f 
								
							 
						 
						
							
							
								
								Add a docstring to HelpAction  
							
							
							
						 
						
							2017-06-01 22:25:09 +03:00  
				
					
						
							
							
								 
						
							
								f74f14f038 
								
							 
						 
						
							
							
								
								Fix --help with required options  
							
							... 
							
							
							
							This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.
Fixes : #1999  
							
						 
						
							2017-06-01 21:29:50 +03:00  
				
					
						
							
							
								 
						
							
								021e843427 
								
							 
						 
						
							
							
								
								Fixed   #2121  Use `py.path`s fnmatch. This fixes an issue where  
							
							... 
							
							
							
							python_files handled properly when rewriting assertions. 
							
						 
						
							2017-05-31 08:25:04 +02:00  
				
					
						
							
							
								 
						
							
								1dee443c2b 
								
							 
						 
						
							
							
								
								Merge pull request  #2445  from nicoddemus/warnings-remove-filter  
							
							... 
							
							
							
							No longer override existing warning filters during warnings capture 
							
						 
						
							2017-05-30 18:14:01 -03:00  
				
					
						
							
							
								 
						
							
								32e2642233 
								
							 
						 
						
							
							
								
								No longer override existing warning filters during warnings capture  
							
							... 
							
							
							
							Fix  #2430  
						
							2017-05-30 17:17:36 -03:00  
				
					
						
							
							
								 
						
							
								f96a1d89c5 
								
							 
						 
						
							
							
								
								pytest.deprecated_call now captures PendingDeprecationWarning in context manager form  
							
							... 
							
							
							
							Fix  #2441  
						
							2017-05-30 12:52:18 -03:00  
				
					
						
							
							
								 
						
							
								836dc451f4 
								
							 
						 
						
							
							
								
								Fix unicode issue while running doctests in Python 2  
							
							... 
							
							
							
							Fix  #2434  
						
							2017-05-26 07:35:14 -03:00  
				
					
						
							
							
								 
						
							
								d7a5c5716f 
								
							 
						 
						
							
							
								
								Add UnicodeWarning for unicode warnings in Python2  
							
							
							
						 
						
							2017-05-26 13:12:02 +08:00  
				
					
						
							
							
								 
						
							
								c39689da41 
								
							 
						 
						
							
							
								
								Correct warnings with unicode message.  
							
							
							
						 
						
							2017-05-25 17:59:42 +08:00  
				
					
						
							
							
								 
						
							
								d9b93674c3 
								
							 
						 
						
							
							
								
								Make --cache-show output deterministic  
							
							... 
							
							
							
							This makes sure things don't jump around in the regenerated docs. 
							
						 
						
							2017-05-23 08:01:39 +02:00  
				
					
						
							
							
								 
						
							
								d343f9497c 
								
							 
						 
						
							
							
								
								Merge branch 'release-3.1'  
							
							
							
						 
						
							2017-05-22 19:10:06 -03:00  
				
					
						
							
							
								 
						
							
								c9c2c34b44 
								
							 
						 
						
							
							
								
								Remove unused parameter  
							
							
							
						 
						
							2017-05-20 04:39:45 -04:00  
				
					
						
							
							
								 
						
							
								9beeef970e 
								
							 
						 
						
							
							
								
								Parse the filename in the generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								43aa037ebd 
								
							 
						 
						
							
							
								
								Reindent  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								2abf2070f2 
								
							 
						 
						
							
							
								
								Collapse nested for loops into a generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								ce0ff0040f 
								
							 
						 
						
							
							
								
								Reindent and add docstring  
							
							
							
						 
						
							2017-05-20 04:38:27 -04:00  
				
					
						
							
							
								 
						
							
								6d2e11b7d1 
								
							 
						 
						
							
							
								
								Extract method for _mark_plugins_for_rewrite  
							
							
							
						 
						
							2017-05-20 04:18:41 -04:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
				
					
						
							
							
								 
						
							
								783670b84e 
								
							 
						 
						
							
							
								
								Merge pull request  #2274  from dmand/feat/junitxml/suite-name-option  
							
							... 
							
							
							
							Add `junit_suite_name` ini option 
							
						 
						
							2017-05-13 19:10:29 +02:00  
				
					
						
							
							
								 
						
							
								c9282f9e94 
								
							 
						 
						
							
							
								
								Transition to using ini option for suite name  
							
							
							
						 
						
							2017-05-12 17:48:50 -03:00  
				
					
						
							
							
								 
						
							
								fe7d89f033 
								
							 
						 
						
							
							
								
								Add '--junit-suite-name' CLI option  
							
							
							
						 
						
							2017-05-12 17:48:50 -03:00  
				
					
						
							
							
								 
						
							
								8bcf88ec12 
								
							 
						 
						
							
							
								
								try to consider all modules after registration as plugin  
							
							
							
						 
						
							2017-05-05 11:16:05 +02:00  
				
					
						
							
							
								 
						
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
				
					
						
							
							
								 
						
							
								630cca2fba 
								
							 
						 
						
							
							
								
								Fix py35-trial environment  
							
							... 
							
							
							
							After updating to twisted 17.1.0, again the trial tests started to fail; didn't investigate too deep, decided to just
no longer delete "zope" modules when cleaning up after pytester because it seems more zope modules keep
global state that shouldn't be discarded 
							
						 
						
							2017-05-02 21:05:42 -03:00  
				
					
						
							
							
								 
						
							
								60b8339166 
								
							 
						 
						
							
							
								
								Issue  #2383  - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.  
							
							
							
						 
						
							2017-04-29 14:32:09 +03:00  
				
					
						
							
							
								 
						
							
								cccb2cc92b 
								
							 
						 
						
							
							
								
								Merge pull request  #1834  from RonnyPfannschmidt/setuptools-scm-take-2  
							
							... 
							
							
							
							second take at setuptools_scm 
							
						 
						
							2017-04-27 09:10:23 -03:00  
				
					
						
							
							
								 
						
							
								a280e43949 
								
							 
						 
						
							
							
								
								fix import error  
							
							
							
						 
						
							2017-04-26 15:57:55 +02:00  
				
					
						
							
							
								 
						
							
								e02cb6d7ce 
								
							 
						 
						
							
							
								
								restore setuptools_scm write_to usage  
							
							
							
						 
						
							2017-04-23 16:59:08 +02:00  
				
					
						
							
							
								 
						
							
								25371ddbfd 
								
							 
						 
						
							
							
								
								Merge pull request  #2315  from RonnyPfannschmidt/namespace-hook  
							
							... 
							
							
							
							remove pytest internal usage of the namespace hook 
							
						 
						
							2017-04-21 16:24:20 -03:00  
				
					
						
							
							
								 
						
							
								4242bf6262 
								
							 
						 
						
							
							
								
								use unknown to specify unknown versions  
							
							
							
						 
						
							2017-04-20 21:46:58 +02:00  
				
					
						
							
							
								 
						
							
								dcefb287fc 
								
							 
						 
						
							
							
								
								Try not to assume a module's file extension is .py  
							
							
							
						 
						
							2017-04-19 12:26:56 -07:00  
				
					
						
							
							
								 
						
							
								2cf422733c 
								
							 
						 
						
							
							
								
								restore linting, drop _pytest._version for check-manifest  
							
							
							
						 
						
							2017-04-19 20:25:53 +02:00  
				
					
						
							
							
								 
						
							
								c3aee4b1e6 
								
							 
						 
						
							
							
								
								second take at setuptools_scm  
							
							... 
							
							
							
							since setuptools 18.6 fixes the issues with develop installs
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186 
https://github.com/pypa/setuptools/issues/439  
							
						 
						
							2017-04-19 19:40:42 +02:00  
				
					
						
							
							
								 
						
							
								cac82e71d8 
								
							 
						 
						
							
							
								
								Improve item.warn handling of fslocation parameter  
							
							... 
							
							
							
							Just pass fslocation forward and let the hook implementer decide what to do with the parameter 
							
						 
						
							2017-04-13 19:01:14 -03:00  
				
					
						
							
							
								 
						
							
								d9a2e70155 
								
							 
						 
						
							
							
								
								Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs  
							
							... 
							
							
							
							Related to #2366  
							
						 
						
							2017-04-13 17:34:48 -03:00  
				
					
						
							
							
								 
						
							
								7d4ac14a31 
								
							 
						 
						
							
							
								
								Fix   #2343 : Replace version checks by constants.  
							
							... 
							
							
							
							This way they do not have to be recomputed at runtime. 
							
						 
						
							2017-04-12 08:18:09 +02:00  
				
					
						
							
							
								 
						
							
								731776702d 
								
							 
						 
						
							
							
								
								Fix hook name in LsofFdLeakChecker  
							
							
							
						 
						
							2017-04-11 21:55:12 -03:00  
				
					
						
							
							
								 
						
							
								83c508eea3 
								
							 
						 
						
							
							
								
								Verify hooks after collection completes  
							
							... 
							
							
							
							Fix  #1821  
						
							2017-04-11 21:55:12 -03:00  
				
					
						
							
							
								 
						
							
								78ac1bf5d1 
								
							 
						 
						
							
							
								
								Merge pull request  #2350  from nicoddemus/future-imports-rewrite  
							
							... 
							
							
							
							Ensure rewritten modules don't inherit __future__ flags from pytest 
							
						 
						
							2017-04-11 20:59:05 -03:00  
				
					
						
							
							
								 
						
							
								0ab85e7a9c 
								
							 
						 
						
							
							
								
								Changed behavior if --lf and --ff are both used.  
							
							... 
							
							
							
							When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests. 
							
						 
						
							2017-04-10 17:46:13 +09:00  
				
					
						
							
							
								 
						
							
								21f1c2b03f 
								
							 
						 
						
							
							
								
								Update fixtures.py  
							
							... 
							
							
							
							Corrected "or or" typo in docstring (and made indentation consistent). 
							
						 
						
							2017-04-07 16:48:38 +01:00  
				
					
						
							
							
								 
						
							
								1b5f898dc5 
								
							 
						 
						
							
							
								
								Ensure rewritten modules don't inherit __future__ flags from pytest  
							
							... 
							
							
							
							In a recent refactoring we enabled all __future__ features in pytest
modules, but that has the unwanted side effect of propagating those
features to compile()'d modules inside assertion rewriting, unless
we pass dont_inherit=False to compile(). 
							
						 
						
							2017-04-06 15:00:36 -03:00  
				
					
						
							
							
								 
						
							
								417b54abed 
								
							 
						 
						
							
							
								
								added option to unicode plugin name  
							
							
							
						 
						
							2017-04-05 13:03:11 +00:00  
				
					
						
							
							
								 
						
							
								a542ed48a2 
								
							 
						 
						
							
							
								
								Convert using utf-8 instead of ascii in safe_str()  
							
							... 
							
							
							
							This way we don't lose information and the returned string is
ascii-compatible anyway 
							
						 
						
							2017-03-29 15:18:41 -03:00  
				
					
						
							
							
								 
						
							
								58ac4faf0c 
								
							 
						 
						
							
							
								
								Fix exception formatting while importing test modules  
							
							... 
							
							
							
							Fix  #2336  
						
							2017-03-29 14:43:13 -03:00  
				
					
						
							
							
								 
						
							
								afb1778294 
								
							 
						 
						
							
							
								
								put in a singular namespace hook to work around the strange issue  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								ebeba79be3 
								
							 
						 
						
							
							
								
								remove the namespace hook from mark after the param feature merge  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								6165939b0d 
								
							 
						 
						
							
							
								
								fix rebase mistakes  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								efe03400d8 
								
							 
						 
						
							
							
								
								fixup nose/pytest plugins  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								c9ab421398 
								
							 
						 
						
							
							
								
								fix python2 only import loop failure  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								147bb8aea5 
								
							 
						 
						
							
							
								
								correct setting pytest.config  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								7cdefce656 
								
							 
						 
						
							
							
								
								fix up oversights  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								92f6ab1881 
								
							 
						 
						
							
							
								
								fix all singular internal module imports and add a test for them  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								23bc9815c4 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.fixtures  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								ae234786ea 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.python  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								99c8f2d403 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.main  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								61f418a267 
								
							 
						 
						
							
							
								
								hollow out pytest_namespace in _pytest.fixtures  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								9b58d6eaca 
								
							 
						 
						
							
							
								
								prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								839c936153 
								
							 
						 
						
							
							
								
								_pytest.mark: fix unconfigure after bad configure, still potential bug  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								7d797b7dbf 
								
							 
						 
						
							
							
								
								add a note about the deprecation of the pytest_namespace hook  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								9b755f6ec6 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.skipping  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								90788defb2 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								6a02cdbb35 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest/runner.py  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								c74103f395 
								
							 
						 
						
							
							
								
								remove pytest_namespace from recwarn and fixture decorators  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								794fd5658c 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest/debugging.py  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								fab9b993f8 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.freeze_support  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								5818e65cf3 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest/assertion  
							
							
							
						 
						
							2017-03-28 11:35:29 +02:00  
				
					
						
							
							
								 
						
							
								2c730743f1 
								
							 
						 
						
							
							
								
								Fix errors related to warnings raised by xdist  
							
							... 
							
							
							
							- pytester was creating a 'pexpect' directory to serve as temporary dir, but due to the fact that
   xdist adds the current directory to sys.path, that directory was being considered as candidate
   for import as a package. The directory is empty and a warning was being raised about
   it missing __init__ file, which is now turned into an error by our filterwarnings config
   in pytest.ini.
- Decided to play it safe and ignore any warnings during `pytest.importorskip`.
- pytest-xdist and execnet raise two warnings which should be fixed upstream:
   pytest-dev/pytest-xdist/issues/133 
							
						 
						
							2017-03-21 22:17:07 -03:00  
				
					
						
							
							
								 
						
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							
							
						 
						
							2017-03-20 22:13:17 -03:00  
				
					
						
							
							
								 
						
							
								d027f760c0 
								
							 
						 
						
							
							
								
								Avoid displaying the same warning multiple times for an item  
							
							
							
						 
						
							2017-03-20 20:40:53 -03:00  
				
					
						
							
							
								 
						
							
								3373e02eae 
								
							 
						 
						
							
							
								
								Add __future__ imports to warnings module  
							
							
							
						 
						
							2017-03-20 20:06:01 -03:00  
				
					
						
							
							
								 
						
							
								9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-20 19:59:05 -03:00  
				
					
						
							
							
								 
						
							
								e368fb4b29 
								
							 
						 
						
							
							
								
								implement pytest.param  
							
							... 
							
							
							
							this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks. 
							
						 
						
							2017-03-17 16:53:43 +01:00  
				
					
						
							
							
								 
						
							
								e5021dc9dc 
								
							 
						 
						
							
							
								
								Replace py.builtin.print_() calls by builtin print() function  
							
							
							
						 
						
							2017-03-16 22:46:51 -03:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								78194093af 
								
							 
						 
						
							
							
								
								Improve warning representation in terminal plugin and fix tests  
							
							
							
						 
						
							2017-03-16 21:57:32 -03:00  
				
					
						
							
							
								 
						
							
								be5db6fa22 
								
							 
						 
						
							
							
								
								Capture warnings around the entire runtestprotocol  
							
							... 
							
							
							
							This is necessary for the warnings plugin to play nice with the
recwarn fixture 
							
						 
						
							2017-03-16 21:54:41 -03:00  
				
					
						
							
							
								 
						
							
								0baed781fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-16 20:02:06 -03:00  
				
					
						
							
							
								 
						
							
								dc6890709e 
								
							 
						 
						
							
							
								
								Change ValueError to io.UnsupportedOperation in capture.py. Resolves issue  #2276  
							
							
							
						 
						
							2017-03-14 18:55:58 -03:00  
				
					
						
							
							
								 
						
							
								fa15ae7545 
								
							 
						 
						
							
							
								
								Post 3.0.7 release handling  
							
							
							
						 
						
							2017-03-14 18:07:44 -03:00  
				
					
						
							
							
								 
						
							
								b1ab2ca963 
								
							 
						 
						
							
							
								
								Bump to version 3.0.7 and update CHANGELOG  
							
							
							
						 
						
							2017-03-13 18:37:49 -04:00  
				
					
						
							
							
								 
						
							
								22864b75ee 
								
							 
						 
						
							
							
								
								Refactor recwarn to use warnings.catch_warnings instead of custom code  
							
							... 
							
							
							
							Since we dropped 2.5, we can now use warnings.catch_warnings to do the
"catch warnings" magic for us, simplifying the code a bit. 
							
						 
						
							2017-03-13 19:28:36 -03:00  
				
					
						
							
							
								 
						
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								cee578e327 
								
							 
						 
						
							
							
								
								Fix trailing whitespace in terminal output  
							
							
							
						 
						
							2017-03-05 23:20:55 +03:00  
				
					
						
							
							
								 
						
							
								272afa9422 
								
							 
						 
						
							
							
								
								Display node ids and the warnings generated by it  
							
							... 
							
							
							
							The rationale of using node ids is that users can copy/paste it to run a chosen test 
							
						 
						
							2017-03-04 20:53:42 -03:00  
				
					
						
							
							
								 
						
							
								bddb922f7b 
								
							 
						 
						
							
							
								
								Rename internal option to disable_warnings  
							
							
							
						 
						
							2017-03-04 16:32:10 -03:00  
				
					
						
							
							
								 
						
							
								de09023e45 
								
							 
						 
						
							
							
								
								Also capture warnings during setup/teardown  
							
							
							
						 
						
							2017-03-04 16:15:03 -03:00  
				
					
						
							
							
								 
						
							
								e24081bf76 
								
							 
						 
						
							
							
								
								Change warning output  
							
							
							
						 
						
							2017-03-04 15:59:20 -03:00  
				
					
						
							
							
								 
						
							
								6a52fe1650 
								
							 
						 
						
							
							
								
								fixed internal error on unprintable raised AssertionErrors  
							
							
							
						 
						
							2017-03-04 10:26:46 +02:00  
				
					
						
							
							
								 
						
							
								26e50f1162 
								
							 
						 
						
							
							
								
								junitxml: adjust junitxml output file to comply with JUnit xsd  
							
							... 
							
							
							
							Change XML file structure in the manner that failures in call and errors
in teardown in one test will appear under separate testcase elements in
the XML report. 
							
						 
						
							2017-03-02 15:10:25 +01:00  
				
					
						
							
							
								 
						
							
								3aac3d0a00 
								
							 
						 
						
							
							
								
								Merge branch 'master' into anydbmfix  
							
							
							
						 
						
							2017-03-01 14:41:18 -03:00  
				
					
						
							
							
								 
						
							
								8b598f00e9 
								
							 
						 
						
							
							
								
								Make pytester use pytest's capture implementation  
							
							
							
						 
						
							2017-02-23 17:46:28 -08:00  
				
					
						
							
							
								 
						
							
								6ba3475448 
								
							 
						 
						
							
							
								
								Make capsys more like stdio streams in python3.   Resolves   #1407 .  
							
							
							
						 
						
							2017-02-23 17:46:27 -08:00  
				
					
						
							
							
								 
						
							
								d3a6be4130 
								
							 
						 
						
							
							
								
								junitxml: Fix double system-out tags per testcase  
							
							... 
							
							
							
							In the xml report we now have two occurences for the system-out tag if
the testcase writes to stdout both on call and teardown and fails in
teardown.
This behaviour is against the xsd.
This patch makes sure that the system-out section exists only
once per testcase. 
							
						 
						
							2017-02-22 16:39:20 +01:00  
				
					
						
							
							
								 
						
							
								82785fcd40 
								
							 
						 
						
							
							
								
								Use warnings.catch_warnings instead of WarningsRecorder  
							
							... 
							
							
							
							This has the benefical side-effect of not calling the original
warnings.showwarnings function, which in its original form
only writes the formatted warning to sys.stdout.
Calling the original warnings.showwarnings has the effect that nested WarningsRecorder all catch the warnings:
with WarningsRecorder() as rec1:
    with WarningsRecorder() as rec2:
        warnings.warn(UserWarning, 'some warning')
(both rec1 and rec2 sees the warning)
When running tests with `testdir`, the main pytest session would then see the warnings created by
the internal code being tested (if any), and the main pytest session would end up with warnings as well. 
							
						 
						
							2017-02-18 13:08:14 -02:00  
				
					
						
							
							
								 
						
							
								a7643a5fbe 
								
							 
						 
						
							
							
								
								Merge branch 'features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-02-18 11:03:15 -02:00  
				
					
						
							
							
								 
						
							
								f1900bbea6 
								
							 
						 
						
							
							
								
								Revert subclassing explicitly from object introduced by accident in  #2260  
							
							
							
						 
						
							2017-02-18 10:34:41 -02:00  
				
					
						
							
							
								 
						
							
								a88017cf26 
								
							 
						 
						
							
							
								
								Add note documenting  #2257  
							
							
							
						 
						
							2017-02-16 23:00:55 -07:00  
				
					
						
							
							
								 
						
							
								58d7f4e048 
								
							 
						 
						
							
							
								
								Correct typo  
							
							
							
						 
						
							2017-02-16 22:52:06 -07:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								9c809f5ad0 
								
							 
						 
						
							
							
								
								Merge pull request  #2255  from scop/spelling  
							
							... 
							
							
							
							Spelling fixes 
							
						 
						
							2017-02-15 18:41:49 -02:00  
				
					
						
							
							
								 
						
							
								27f12ed0c3 
								
							 
						 
						
							
							
								
								Merge pull request  #2254  from scop/py36-escseq  
							
							... 
							
							
							
							Python 3.6 invalid escape sequence deprecation fixes 
							
						 
						
							2017-02-15 18:41:06 -02:00  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								eeb6603d71 
								
							 
						 
						
							
							
								
								Python 3.6 invalid escape sequence deprecation fixes  
							
							
							
						 
						
							2017-02-15 16:54:53 +02:00  
				
					
						
							
							
								 
						
							
								91c6bef77a 
								
							 
						 
						
							
							
								
								Add venv to the default norecursedirs  
							
							... 
							
							
							
							venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that. 
							
						 
						
							2017-02-15 14:55:12 +01:00  
				
					
						
							
							
								 
						
							
								58ce3a9e8c 
								
							 
						 
						
							
							
								
								Safer sys.modules delete  
							
							
							
						 
						
							2017-02-14 16:54:32 -08:00  
				
					
						
							
							
								 
						
							
								9eb1d73951 
								
							 
						 
						
							
							
								
								--override-ini now correctly overrides some fundamental options like "python_files"  
							
							... 
							
							
							
							#2238  
						
							2017-02-08 23:03:33 -02:00  
				
					
						
							
							
								 
						
							
								6a097aa0f1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into allow_skipping_unittests_with_pdb_active  
							
							
							
						 
						
							2017-02-08 20:30:14 -02:00  
				
					
						
							
							
								 
						
							
								3a0a0c2df9 
								
							 
						 
						
							
							
								
								Ignore errors raised from descriptors when collecting fixtures  
							
							... 
							
							
							
							Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.
A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.
In other words, putting something like this in your test class is still
a bad idea...:
    @property
    def innocent(self):
        os.system('rm -rf /')
Fixes  #2234 . 
							
						 
						
							2017-02-07 14:27:34 +02:00  
				
					
						
							
							
								 
						
							
								87fb689ab1 
								
							 
						 
						
							
							
								
								Remove an unneeded `except KeyboardInterrupt`  
							
							... 
							
							
							
							KeyboardInterrupt is a subclass of BaseException, but not of Exception.
Hence if we remove this except, KeyboardInterrupts will still be raised
so the behavior stays the same. 
							
						 
						
							2017-02-07 14:12:09 +02:00  
				
					
						
							
							
								 
						
							
								ccf9877447 
								
							 
						 
						
							
							
								
								Merge pull request  #2232  from vidartf/patch-1  
							
							... 
							
							
							
							Do not asssume `Item.obj` in 'skipping' plugin 
							
						 
						
							2017-02-03 21:39:42 -02:00  
				
					
						
							
							
								 
						
							
								a4d2a5785b 
								
							 
						 
						
							
							
								
								Merge pull request  #2142  from barneygale/xfail_without_condition_getglobals  
							
							... 
							
							
							
							'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin` 
							
						 
						
							2017-02-03 16:09:47 -02:00  
				
					
						
							
							
								 
						
							
								bad261279c 
								
							 
						 
						
							
							
								
								Do not asssume `Item.obj` in 'skipping' plugin  
							
							... 
							
							
							
							See #2231  for discussion. 
							
						 
						
							2017-02-03 16:04:34 +01:00  
				
					
						
							
							
								 
						
							
								43662ce789 
								
							 
						 
						
							
							
								
								allow error message matching in pytest.raises  
							
							
							
						 
						
							2017-02-02 19:52:33 +01:00  
				
					
						
							
							
								 
						
							
								ad56cd8027 
								
							 
						 
						
							
							
								
								extract a _handle_skip method, secure PY2 branch  
							
							
							
						 
						
							2017-02-02 05:01:51 +01:00  
				
					
						
							
							
								 
						
							
								176c680e19 
								
							 
						 
						
							
							
								
								Merge branch 'master' into allow_skipping_unittests_with_pdb_active  
							
							
							
						 
						
							2017-02-01 15:53:14 -02:00  
				
					
						
							
							
								 
						
							
								e1c5314d80 
								
							 
						 
						
							
							
								
								Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479  
							
							... 
							
							
							
							Fix  #2160  
						
							2017-02-01 02:37:55 -02:00  
				
					
						
							
							
								 
						
							
								36b6f17727 
								
							 
						 
						
							
							
								
								fixing code-style, keep flake8 happy  
							
							
							
						 
						
							2017-01-31 21:03:49 +01:00  
				
					
						
							
							
								 
						
							
								d1c725078a 
								
							 
						 
						
							
							
								
								Allow to skip unittests if --pdb active  
							
							... 
							
							
							
							closes  #2137  
						
							2017-01-31 04:47:31 +01:00  
				
					
						
							
							
								 
						
							
								3b47cb45e6 
								
							 
						 
						
							
							
								
								Merge pull request  #2222  from RonnyPfannschmidt/features  
							
							... 
							
							
							
							merge master into features 
							
						 
						
							2017-01-26 13:48:10 +01:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								c9f327dc87 
								
							 
						 
						
							
							
								
								bump version to next dev  
							
							
							
						 
						
							2017-01-22 22:21:08 +01:00  
				
					
						
							
							
								 
						
							
								01eaf9db51 
								
							 
						 
						
							
							
								
								fix the xfail docstring typo at the actual docstring + regendoc  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								55f21bd2b9 
								
							 
						 
						
							
							
								
								bump version  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								0e58c3fa80 
								
							 
						 
						
							
							
								
								updates for PR review  #2198  
							
							
							
						 
						
							2017-01-21 16:47:49 +13:00  
				
					
						
							
							
								 
						
							
								c848d0a771 
								
							 
						 
						
							
							
								
								Pass parameter name to `make_parametrize_id` hook function  
							
							
							
						 
						
							2017-01-21 16:46:45 +13:00  
				
					
						
							
							
								 
						
							
								15a3b57ec7 
								
							 
						 
						
							
							
								
								Merge pull request  #2120  from RonnyPfannschmidt/fix-2118  
							
							... 
							
							
							
							fix  #2118  - rework Node._getcustomclass and Node compat properties 
						
							2017-01-20 14:38:55 -02:00  
				
					
						
							
							
								 
						
							
								7b4afd8946 
								
							 
						 
						
							
							
								
								remove unused import  
							
							
							
						 
						
							2017-01-20 12:09:49 +01:00  
				
					
						
							
							
								 
						
							
								3766060893 
								
							 
						 
						
							
							
								
								Merge branch 'master' into trial-envs  
							
							
							
						 
						
							2017-01-20 08:37:34 -02:00  
				
					
						
							
							
								 
						
							
								4082f4024a 
								
							 
						 
						
							
							
								
								comment out compatproperty deprecations  
							
							... 
							
							
							
							todo: reenable in the features branch 
							
						 
						
							2017-01-20 11:25:48 +01:00  
				
					
						
							
							
								 
						
							
								e0c48b4fe7 
								
							 
						 
						
							
							
								
								Merge pull request  #2212  from nicoddemus/pytester-rewrite  
							
							... 
							
							
							
							Assert statements of the pytester plugin again benefit from assertion rewriting
fixes  #1920  
							
						 
						
							2017-01-20 10:04:12 +01:00  
				
					
						
							
							
								 
						
							
								7b4368f3f4 
								
							 
						 
						
							
							
								
								Merge pull request  #2184  from eli-b/parseoutcomes-explicit-failure  
							
							... 
							
							
							
							Fail assert_outcomes() on missing terminal report 
							
						 
						
							2017-01-19 21:38:54 -02:00  
				
					
						
							
							
								 
						
							
								c477f09177 
								
							 
						 
						
							
							
								
								Assert statements of the pytester plugin again benefit from assertion rewriting  
							
							... 
							
							
							
							Fix  #1920  
						
							2017-01-19 21:33:51 -02:00  
				
					
						
							
							
								 
						
							
								2574da8d32 
								
							 
						 
						
							
							
								
								Fix pytester internal plugin to work correctly with latest versions of zope.interface  
							
							... 
							
							
							
							Fix  #1989  
						
							2017-01-19 20:53:35 -02:00