5afb61ad26 
								
							 
						 
						
							
							
								
								Fix trailing white-space  
							
							
							
						 
						
							2015-12-25 17:51:55 -02:00  
				
					
						
							
							
								 
						
							
								57bc14caa0 
								
							 
						 
						
							
							
								
								Apply readline workaround during initial conftest loading  
							
							
							
						 
						
							2015-12-25 17:46:19 -02:00  
				
					
						
							
							
								 
						
							
								6e170a4a1c 
								
							 
						 
						
							
							
								
								* Moved workaround to its own function, mostly for the sake of adding  
							
							... 
							
							
							
							a more descriptive docstring (the workaround itself is just to import
  readline earlier).  I removed the conditional on targetfd from the
  workaround since it doesn't really matter.
* Added # noqa marker.
* Added changelog entry, and self to authors. 
							
						 
						
							2015-12-24 16:43:34 -05:00  
				
					
						
							
							
								 
						
							
								924a9667e1 
								
							 
						 
						
							
							
								
								Make sure readline has been imported before duping any stdio handles--otherwise pyreadline fails to connect to the correct handle for the console's stdout/in.  
							
							
							
						 
						
							2015-12-24 14:56:57 -05:00  
				
					
						
							
							
								 
						
							
								943099ddd1 
								
							 
						 
						
							
							
								
								Merge newinterpret into reinterpret.py  
							
							
							
						 
						
							2015-12-16 18:31:43 -02:00  
				
					
						
							
							
								 
						
							
								81588d7f63 
								
							 
						 
						
							
							
								
								Remove obsolete "oldinterpret" module  
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							... 
							
							
							
							Fix  #1226  
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								8bf7e7cc4b 
								
							 
						 
						
							
							
								
								fixes   #1259  - take finalized nodes out of the mapping  
							
							... 
							
							
							
							this allows double node id usage for file based items 
							
						 
						
							2015-12-16 19:09:44 +01:00  
				
					
						
							
							
								 
						
							
								2b2bec6b97 
								
							 
						 
						
							
							
								
								Remove experimental status from pytest_exception_interact  
							
							
							
						 
						
							2015-12-16 14:29:39 -02:00  
				
					
						
							
							
								 
						
							
								6ac31088c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2015-12-11 23:13:50 -02:00  
				
					
						
							
							
								 
						
							
								e87facfb22 
								
							 
						 
						
							
							
								
								Bump master to 2.8.6.dev1  
							
							
							
						 
						
							2015-12-11 23:07:30 -02:00  
				
					
						
							
							
								 
						
							
								a124163425 
								
							 
						 
						
							
							
								
								Prepare for 2.8.5: bump version, CHANGELOG, announce  
							
							
							
						 
						
							2015-12-11 19:20:07 -02:00  
				
					
						
							
							
								 
						
							
								86b6ce5042 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2015-12-10 19:41:14 -02:00  
				
					
						
							
							
								 
						
							
								8b61a332ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'bukzor/features-merge-master' into features  
							
							
							
						 
						
							2015-12-10 19:03:55 -02:00  
				
					
						
							
							
								 
						
							
								ec02f694ef 
								
							 
						 
						
							
							
								
								Update python.py  
							
							... 
							
							
							
							updated dictionary itteration to create a list for generation, so that tests can be added in the generator functions under python3. This works fine as-is in python2 because python 2 already creates a list, whereas python3 returns an itterator. Forcing a list format for the return fixes python3 to work the same way as python2 
							
						 
						
							2015-12-09 11:32:19 -08:00  
				
					
						
							
							
								 
						
							
								1c46462991 
								
							 
						 
						
							
							
								
								Fix deprecated_call regression introduced in 2.8.4  
							
							... 
							
							
							
							Fix  #1238  
						
							2015-12-08 22:40:05 -02:00  
				
					
						
							
							
								 
						
							
								eabf2f9091 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py 
							
						 
						
							2015-12-07 14:28:59 -08:00  
				
					
						
							
							
								 
						
							
								fbac936596 
								
							 
						 
						
							
							
								
								Add -rp and -rP options to report passing tests.  
							
							... 
							
							
							
							-rP is an alternative to `-s` for viewing the output of passing tests.
This causes the captured stdout/stderr of passing tests to be output in
the same way as that of failing tests.
-rp adds a simple one-line-per-test summary for passing tests.
Neither option is included by -ra.
Additional changes to `pytest_capturelog` and `pytest_catchlog` are
needed for this option to also output captured logs: They must be
changed to use `rep.sections.add` instead of `rep.longrepr.addsection`,
and to add these additional sections even if the test passes, since
passing tests don't seem to have a `longrepr` at report time. 
							
						 
						
							2015-12-07 11:32:56 -10:00  
				
					
						
							
							
								 
						
							
								7b7737bf96 
								
							 
						 
						
							
							
								
								handle duplicate test ids via collection and xdist each reporting  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								9ea7826427 
								
							 
						 
						
							
							
								
								Junitxml: correct node reporter attribute names  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								09cc45b0c5 
								
							 
						 
						
							
							
								
								junitxml: correct docstring of make_properties_node  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								0aa54101c9 
								
							 
						 
						
							
							
								
								junitxml: follow Bruno's attribute/method naming hint from the review  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								518c88f149 
								
							 
						 
						
							
							
								
								finalize nodereporters by throwing away the intermediate xml nodes, fixes issue  #1074  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								5f5a7995b9 
								
							 
						 
						
							
							
								
								reintroduce junitxml report order and debug cleanups  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								0528e5b45f 
								
							 
						 
						
							
							
								
								junitxml: intermediate, move testcase generation to NodeReporter  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								9b04958303 
								
							 
						 
						
							
							
								
								junitxml: keep track of custom property insert order  
							
							... 
							
							
							
							+ review: should we allow the same key multile times 
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								faed54d6c7 
								
							 
						 
						
							
							
								
								junitxml: use node.warn to ensure fslocations  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								1f609f96e6 
								
							 
						 
						
							
							
								
								junitxml: introduce nodereporter and track durations/properties there  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								0664ae137c 
								
							 
						 
						
							
							
								
								junitxml: remove debug print  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								d0107c898e 
								
							 
						 
						
							
							
								
								junitxml restrucutre stat generation - use node tags  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								2a31df072b 
								
							 
						 
						
							
							
								
								junitxml: reverse the if/else logic for failure appending  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								02f5defd89 
								
							 
						 
						
							
							
								
								yapf junitxml  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								c727860241 
								
							 
						 
						
							
							
								
								bump to 2.8.5.dev  
							
							
							
						 
						
							2015-12-06 20:31:14 +01:00  
				
					
						
							
							
								 
						
							
								a3353c49fd 
								
							 
						 
						
							
							
								
								prepare release 2.8.4 - changelog updates + version bump  
							
							
							
						 
						
							2015-12-06 16:13:55 +01:00  
				
					
						
							
							
								 
						
							
								14bc3c4009 
								
							 
						 
						
							
							
								
								Fix pastebin when captured output contains non-ascii characters  
							
							... 
							
							
							
							Fix  #1219  
						
							2015-12-03 20:07:18 -02:00  
				
					
						
							
							
								 
						
							
								a54e4e64cd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into pastebin-py3  
							
							
							
						 
						
							2015-12-01 23:51:14 -02:00  
				
					
						
							
							
								 
						
							
								6a2ebddc7c 
								
							 
						 
						
							
							
								
								Decode urlopen response in pastebin  
							
							... 
							
							
							
							Fix  #1198  
						
							2015-12-01 23:33:37 -02:00  
				
					
						
							
							
								 
						
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							
							
						 
						
							2015-12-01 01:41:47 -08:00  
				
					
						
							
							
								 
						
							
								0d2668017d 
								
							 
						 
						
							
							
								
								Fix spelling mistake in  #1207 .  
							
							
							
						 
						
							2015-11-30 17:33:34 +01:00  
				
					
						
							
							
								 
						
							
								aba55a0fb2 
								
							 
						 
						
							
							
								
								Fix terminal output if no tests were run.  
							
							... 
							
							
							
							Before:
====  in 0.00 seconds ====
After:
==== no tests run in 0.00 seconds ==== 
							
						 
						
							2015-11-30 17:24:40 +01:00  
				
					
						
							
							
								 
						
							
								b5d65e5139 
								
							 
						 
						
							
							
								
								Merge pull request  #1206  from The-Compiler/collect-getattr  
							
							... 
							
							
							
							Don't collect classes with truthy __getattr__. 
							
						 
						
							2015-11-30 17:23:47 +01:00  
				
					
						
							
							
								 
						
							
								ba9146c131 
								
							 
						 
						
							
							
								
								Don't collect classes with truthy __getattr__.  
							
							... 
							
							
							
							When we have a metaclass which returns something truthy (like a method) in its
__getattr__, we collected the class because pytest thought its __test__
attribute was set to True.
We can work around this to some degree by assuming __test__ will always be set
to an explicit True if that's what the user has intended, and if it's something
other than that, this is probably a mistake.
Fixes  #1204 . 
							
						 
						
							2015-11-30 16:41:13 +01:00  
				
					
						
							
							
								 
						
							
								c790f7475e 
								
							 
						 
						
							
							
								
								Fix getting line number with nasty __getattr__.  
							
							... 
							
							
							
							When an object has a custom __getattr__ which always returns a non-int, we
tried to get compat_co_firstlineno from it and checked it was a integer, which
caused an exception if such a class is mistakenly collected.
If we still mistakenly collect such a class (which is likely to be something
other than a test), we now skip it with a warning (because it probably has an
__init__) instead of producing an error.
See #1204 . 
							
						 
						
							2015-11-30 16:13:15 +01:00  
				
					
						
							
							
								 
						
							
								81ad1689b9 
								
							 
						 
						
							
							
								
								fix   #1198  - removed docoding the result  
							
							
							
						 
						
							2015-11-29 19:20:37 +03:30  
				
					
						
							
							
								 
						
							
								44f60ba141 
								
							 
						 
						
							
							
								
								fixed   #1198  issue by encoding the unicode parameters to bytes and decoding the  
							
							... 
							
							
							
							bytes response to unicode 
							
						 
						
							2015-11-29 18:27:05 +03:30  
				
					
						
							
							
								 
						
							
								603d81ef2f 
								
							 
						 
						
							
							
								
								deprecated_call now uses monkey patching strategy to capture warnings  
							
							... 
							
							
							
							similar to what we had in 2.7, with a few enhancements
Fix  #1190  
							
						 
						
							2015-11-26 16:48:58 -02:00  
				
					
						
							
							
								 
						
							
								6378cdf7a9 
								
							 
						 
						
							
							
								
								Restored 2.7 implentation of deprecated_call  
							
							
							
						 
						
							2015-11-26 15:54:57 -02:00  
				
					
						
							
							
								 
						
							
								b20803f0a6 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							
							
						 
						
							2015-11-23 18:00:02 -02:00  
				
					
						
							
							
								 
						
							
								df767cca8f 
								
							 
						 
						
							
							
								
								Merge pull request  #1188  from nicoddemus/pytest_enter_pdb  
							
							... 
							
							
							
							Pass pytest config object to pytest_enter_pdb 
							
						 
						
							2015-11-23 20:55:33 +01:00  
				
					
						
							
							
								 
						
							
								b3166a538c 
								
							 
						 
						
							
							
								
								Pass pytest's config object to pytest_enter_pdb  
							
							
							
						 
						
							2015-11-23 14:42:21 -02:00  
				
					
						
							
							
								 
						
							
								1f148a93ec 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							
							
						 
						
							2015-11-23 13:02:15 -02:00  
				
					
						
							
							
								 
						
							
								af46ffe021 
								
							 
						 
						
							
							
								
								bump to 2.8.4.dev  
							
							
							
						 
						
							2015-11-19 22:01:34 +01:00  
				
					
						
							
							
								 
						
							
								3dc57d99f2 
								
							 
						 
						
							
							
								
								Changelog groming and release preps for 2.8.3  
							
							
							
						 
						
							2015-11-18 17:34:30 +01:00  
				
					
						
							
							
								 
						
							
								7d6edb9ca5 
								
							 
						 
						
							
							
								
								Fix unittest.skip decorator test and separate the fix into a different, self-doc function  
							
							
							
						 
						
							2015-11-04 19:54:18 -02:00  
				
					
						
							
							
								 
						
							
								313050b15b 
								
							 
						 
						
							
							
								
								Suggested edits by Bruno.  
							
							... 
							
							
							
							Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG 
							
						 
						
							2015-11-04 15:30:16 -05:00  
				
					
						
							
							
								 
						
							
								8de2c035e2 
								
							 
						 
						
							
							
								
								Fixes   #1169  
							
							... 
							
							
							
							The unittest.skip decorator runs @functools.wraps on self._testcase. functools.wraps expects a "__name__" attribute and this patch adds one. It might not be the correct fix, but it works for me. 
							
						 
						
							2015-11-04 13:52:40 -05:00  
				
					
						
							
							
								 
						
							
								9013cb1b4c 
								
							 
						 
						
							
							
								
								Merge pull request  #1144  from The-Compiler/elcapitan-sip  
							
							... 
							
							
							
							Handle EPERM when writing rewritten bytecode. 
							
						 
						
							2015-11-01 08:20:00 +01:00  
				
					
						
							
							
								 
						
							
								f3f61fb5d1 
								
							 
						 
						
							
							
								
								Color highlight on the name of the failed tests  
							
							
							
						 
						
							2015-10-28 08:12:57 +00:00  
				
					
						
							
							
								 
						
							
								9a04879129 
								
							 
						 
						
							
							
								
								Remove commented out extrainit  
							
							... 
							
							
							
							Unused since 2012, and the docstring syntax is incorrect with
four quotes. 
							
						 
						
							2015-10-20 21:08:21 +11:00  
				
					
						
							
							
								 
						
							
								2956627b8b 
								
							 
						 
						
							
							
								
								Handle EPERM when writing rewritten bytecode.  
							
							... 
							
							
							
							Fixes  #1143 . 
						
							2015-10-17 11:55:55 +02:00  
				
					
						
							
							
								 
						
							
								311b0a9683 
								
							 
						 
						
							
							
								
								Fix situation where a traceback entry "path" returns a str object  
							
							... 
							
							
							
							Fix  #1133  
						
							2015-10-16 20:18:14 -03:00  
				
					
						
							
							
								 
						
							
								a3bda59a30 
								
							 
						 
						
							
							
								
								collection: Prevent non-function callables from being collected  
							
							... 
							
							
							
							Fixes issue 331
previously to this change the collection code would issue a warning for
when ever it encountered a variable that looked like a test but wasn't a
function saying that it wouldn't collect it because it wasn't a function.
This fixes the logic so that if that warning is issued it really isn't
collected.
However previously special cases existed to support tests that were
created using functools.wraps and functools.partial. So the condition for
issuing that warning has been updated to take that in to account
Also try the old way of detecting functions just for proper integration
with mock.path in python 2.7 the get_real_func returned the unbound method 
							
						 
						
							2015-10-12 22:23:18 +01:00  
				
					
						
							
							
								 
						
							
								db077555f6 
								
							 
						 
						
							
							
								
								Merge pull request  #1102  from nicoddemus/doctest-fixtures-fix  
							
							... 
							
							
							
							Fix autouse fixtures and doctest modules 
							
						 
						
							2015-10-10 14:21:53 +02:00  
				
					
						
							
							
								 
						
							
								88c8dd96f9 
								
							 
						 
						
							
							
								
								issue1035 Override inspect.isclass for python 2.6  
							
							
							
						 
						
							2015-10-09 19:44:47 +01:00  
				
					
						
							
							
								 
						
							
								0e55a8793f 
								
							 
						 
						
							
							
								
								all tests pass  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								49d46a0059 
								
							 
						 
						
							
							
								
								an ugly patch to fix all but the most important part =/  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								b5b53b6aec 
								
							 
						 
						
							
							
								
								start 2.8.3 development  
							
							
							
						 
						
							2015-10-07 17:56:05 +02:00  
				
					
						
							
							
								 
						
							
								7c529e0afe 
								
							 
						 
						
							
							
								
								Merge branch '2.8.2-release'  
							
							
							
						 
						
							2015-10-07 17:51:34 +02:00  
				
					
						
							
							
								 
						
							
								42937d4bb6 
								
							 
						 
						
							
							
								
								Prepare 2.8.2 release.  
							
							
							
						 
						
							2015-10-06 21:06:25 +02:00  
				
					
						
							
							
								 
						
							
								493530ec6d 
								
							 
						 
						
							
							
								
								typo fix, changed position of context manager notes  
							
							
							
						 
						
							2015-10-05 12:13:25 -07:00  
				
					
						
							
							
								 
						
							
								a14c77aeba 
								
							 
						 
						
							
							
								
								Fix problems when mixing autouse fixtures and doctest modules  
							
							... 
							
							
							
							The main problem was that previously DoctestModule was setting
up its fixtures during collection, instead of letting
each DoctestItem make its own fixture setup
Fix  #1100 
Fix  #1057  
							
						 
						
							2015-10-03 16:07:14 -03:00  
				
					
						
							
							
								 
						
							
								df874db817 
								
							 
						 
						
							
							
								
								Update default reason to "unconditional skip"  
							
							
							
						 
						
							2015-10-03 17:02:18 +01:00  
				
					
						
							
							
								 
						
							
								25d74a5919 
								
							 
						 
						
							
							
								
								Dont explicitly inherit from object  
							
							
							
						 
						
							2015-10-03 16:55:04 +01:00  
				
					
						
							
							
								 
						
							
								213dbe7a5f 
								
							 
						 
						
							
							
								
								newlines  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								9e57954b03 
								
							 
						 
						
							
							
								
								First argument in pytest.mark.skip is a reason  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								eee24138b0 
								
							 
						 
						
							
							
								
								Fix failing test  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								04545f8a54 
								
							 
						 
						
							
							
								
								classes inherit from object  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								ad0b8e31b8 
								
							 
						 
						
							
							
								
								Fix case where skip is assigned to as an attribute directly  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								b71add27da 
								
							 
						 
						
							
							
								
								Add MarkEvaluator for skip  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								5171d167ce 
								
							 
						 
						
							
							
								
								Move "note" to the end of the main text  
							
							... 
							
							
							
							Fix  #1097  
						
							2015-10-02 18:14:17 -03:00  
				
					
						
							
							
								 
						
							
								2981bece55 
								
							 
						 
						
							
							
								
								pyflakes fix  
							
							
							
						 
						
							2015-10-02 13:03:43 -07:00  
				
					
						
							
							
								 
						
							
								fd211bf490 
								
							 
						 
						
							
							
								
								Add a note about usage of the context manager  
							
							... 
							
							
							
							Addesses #1097  
							
						 
						
							2015-10-02 12:40:58 -07:00  
				
					
						
							
							
								 
						
							
								88209c6ac6 
								
							 
						 
						
							
							
								
								Merge pull request  #1092  from nicoddemus/param-ids-fix  
							
							... 
							
							
							
							Param ids fix 
							
						 
						
							2015-10-01 15:09:11 +02:00  
				
					
						
							
							
								 
						
							
								688f955f5e 
								
							 
						 
						
							
							
								
								Merge pull request  #1058  from nicoddemus/doc-how-disable-cache  
							
							... 
							
							
							
							Add docs on how to disable cache provider 
							
						 
						
							2015-10-01 13:06:02 +02:00  
				
					
						
							
							
								 
						
							
								f3cee8f0b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into param-ids-fix  
							
							
							
						 
						
							2015-10-01 07:58:55 -03:00  
				
					
						
							
							
								 
						
							
								b7fd3f0031 
								
							 
						 
						
							
							
								
								Merge pull request  #1093  from nicoddemus/relto-bug  
							
							... 
							
							
							
							Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
Fixes  #995  
							
						 
						
							2015-10-01 06:00:40 +02:00  
				
					
						
							
							
								 
						
							
								d1e00f6e19 
								
							 
						 
						
							
							
								
								Detect dynamic code explicitly in filter_traceback  
							
							
							
						 
						
							2015-09-30 17:32:49 -03:00  
				
					
						
							
							
								 
						
							
								c9480c5b8b 
								
							 
						 
						
							
							
								
								Move imports outside _escape_bytes as suggested in review  
							
							
							
						 
						
							2015-09-30 17:02:19 -03:00  
				
					
						
							
							
								 
						
							
								a808e09204 
								
							 
						 
						
							
							
								
								fix docstring for cache fixture regarding ``/`` on keys  
							
							
							
						 
						
							2015-09-30 00:27:52 -03:00  
				
					
						
							
							
								 
						
							
								11f100813e 
								
							 
						 
						
							
							
								
								Fix internal error when filtering tracebacks where one entry was generated by an exec() statement  
							
							... 
							
							
							
							Fix  #995  
						
							2015-09-29 22:29:43 -03:00  
				
					
						
							
							
								 
						
							
								b64470443f 
								
							 
						 
						
							
							
								
								Fix SystemError when using unicode_escape on Python 3  
							
							... 
							
							
							
							Fix  #1087  
						
							2015-09-29 18:20:30 -03:00  
				
					
						
							
							
								 
						
							
								8633c4cefd 
								
							 
						 
						
							
							
								
								Fix encoding errors for parametrized tests with unicode parameters in py2  
							
							... 
							
							
							
							Fix  #1085  
						
							2015-09-29 17:57:49 -03:00  
				
					
						
							
							
								 
						
							
								cb58eaa611 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							... 
							
							
							
							Conflicts:
	_pytest/__init__.py
	testing/test_recwarn.py 
							
						 
						
							2015-09-29 15:56:41 +02:00  
				
					
						
							
							
								 
						
							
								c5fd42b699 
								
							 
						 
						
							
							
								
								start 2.8.2 development  
							
							
							
						 
						
							2015-09-29 15:32:33 +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  
				
					
						
							
							
								 
						
							
								f61f39efdd 
								
							 
						 
						
							
							
								
								Merge pull request  #1052  from The-Compiler/no-std-prefix  
							
							... 
							
							
							
							Don't hardcode 'std' for captured stdout/stderr. 
							
						 
						
							2015-09-29 09:19:40 +02:00  
				
					
						
							
							
								 
						
							
								a73d517bee 
								
							 
						 
						
							
							
								
								Merge pull request  #1080  from vodik/master  
							
							... 
							
							
							
							fix  #1034 : Add missing nodeid on pytest_logwarning call in addhook.  Thanks Simon Gomizelj for the PR. 
						
							2015-09-29 09:07:43 +02:00  
				
					
						
							
							
								 
						
							
								b3727438d6 
								
							 
						 
						
							
							
								
								Add missing nodeid on pytest_logwarning call in addhook.  
							
							... 
							
							
							
							Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else. 
							
						 
						
							2015-09-28 20:23:54 -04:00  
				
					
						
							
							
								 
						
							
								b184f391c6 
								
							 
						 
						
							
							
								
								Show known environment variables in py.test --help  
							
							
							
						 
						
							2015-09-28 18:34:16 -03:00  
				
					
						
							
							
								 
						
							
								5f860181b6 
								
							 
						 
						
							
							
								
								Remove print left by accident  
							
							
							
						 
						
							2015-09-28 18:25:20 -03:00