6d4b14d7ee 
								
							 
						 
						
							
							
								
								Merge pull request  #1438  from Bachmann1234/issue-1437  
							
							... 
							
							
							
							Make a good faith effort to display a bytestring when one is provided… 
							
						 
						
							2016-03-06 06:48:32 +01:00  
				
					
						
							
							
								 
						
							
								8ce32b0795 
								
							 
						 
						
							
							
								
								When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!  
							
							
							
						 
						
							2016-03-05 21:04:34 -05:00  
				
					
						
							
							
								 
						
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							... 
							
							
							
							Fix  #1178  
						
							2016-03-05 16:09:01 -03:00  
				
					
						
							
							
								 
						
							
								cf9a09e988 
								
							 
						 
						
							
							
								
								catch IndexError exceptions when getting exception source location  
							
							
							
						 
						
							2016-02-26 08:18:12 -04:00  
				
					
						
							
							
								 
						
							
								79722ae89b 
								
							 
						 
						
							
							
								
								Add expected exceptions to 'DID NOT RAISE' msg  
							
							
							
						 
						
							2016-02-03 14:12:41 +03:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2016-01-14 21:01:57 -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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								88c8dd96f9 
								
							 
						 
						
							
							
								
								issue1035 Override inspect.isclass for python 2.6  
							
							
							
						 
						
							2015-10-09 19:44:47 +01:00  
				
					
						
							
							
								 
						
							
								493530ec6d 
								
							 
						 
						
							
							
								
								typo fix, changed position of context manager notes  
							
							
							
						 
						
							2015-10-05 12:13:25 -07: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  
				
					
						
							
							
								 
						
							
								f3cee8f0b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into param-ids-fix  
							
							
							
						 
						
							2015-10-01 07:58:55 -03: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1c0ffc5caf 
								
							 
						 
						
							
							
								
								seems like pypy's callable builtin calls __getattr__ so we do the check  
							
							... 
							
							
							
							later. 
							
						 
						
							2015-09-28 14:02:30 +02:00  
				
					
						
							
							
								 
						
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
				
					
						
							
							
								 
						
							
								ca460e11e6 
								
							 
						 
						
							
							
								
								Merge pull request  #1051  from Akasurde/issue_1027  
							
							... 
							
							
							
							Added minor documentation change in python.py 
							
						 
						
							2015-09-22 17:09:25 +02:00  
				
					
						
							
							
								 
						
							
								dc1ce51ac2 
								
							 
						 
						
							
							
								
								Added minor documentation change  
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-09-22 20:15:49 +05:30  
				
					
						
							
							
								 
						
							
								3bcda48ba4 
								
							 
						 
						
							
							
								
								Merge pull request  #1009  from mdboom/deprecation-warnings  
							
							... 
							
							
							
							avoid deprecation warnings, introduce helpers. 
							
						 
						
							2015-09-17 13:37:26 +02:00  
				
					
						
							
							
								 
						
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
				
					
						
							
							
								 
						
							
								bf74401fd3 
								
							 
						 
						
							
							
								
								Use __code__.co_argcount  
							
							
							
						 
						
							2015-09-16 11:05:54 -04:00  
				
					
						
							
							
								 
						
							
								08a572086b 
								
							 
						 
						
							
							
								
								Fix lookup of special values  
							
							
							
						 
						
							2015-09-16 11:02:36 -04:00  
				
					
						
							
							
								 
						
							
								9c19728d2b 
								
							 
						 
						
							
							
								
								Fix checking for args  
							
							
							
						 
						
							2015-09-16 06:45:51 -04:00  
				
					
						
							
							
								 
						
							
								859259ddae 
								
							 
						 
						
							
							
								
								Simplify  
							
							
							
						 
						
							2015-09-16 06:43:16 -04:00  
				
					
						
							
							
								 
						
							
								a0cefb3213 
								
							 
						 
						
							
							
								
								Use inspect.signature instead of inspect.getargspec  
							
							
							
						 
						
							2015-09-16 06:33:53 -04:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								885e461ae3 
								
							 
						 
						
							
							
								
								Fix overriding of fixtures with parametrization.  
							
							... 
							
							
							
							Fixes  #979 , see #926 . 
						
							2015-08-31 14:38:39 +02:00  
				
					
						
							
							
								 
						
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00  
				
					
						
							
							
								 
						
							
								06585f5bdd 
								
							 
						 
						
							
							
								
								Always report error about parametrize data that doesn't correspond to fixtures in test functions.  
							
							
							
						 
						
							2015-08-23 13:42:40 +03:00  
				
					
						
							
							
								 
						
							
								41cef6f5f2 
								
							 
						 
						
							
							
								
								Don't skip fixtures that are substrings of params  
							
							... 
							
							
							
							Bug introduced with
https://bitbucket.org/pytest-dev/pytest/pull-requests/257/allow-to-override-parametrized-fixtures 
Fix  #736  
							
						 
						
							2015-08-11 00:41:21 +02:00  
				
					
						
							
							
								 
						
							
								353360dbe5 
								
							 
						 
						
							
							
								
								use local isclass  
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
				
					
						
							
							
								 
						
							
								3497aa0766 
								
							 
						 
						
							
							
								
								check nose.istest __test__ attr issue526  
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
				
					
						
							
							
								 
						
							
								729b5e9b2f 
								
							 
						 
						
							
							
								
								Merge pull request  #923  from The-Compiler/parametrize-idfunc  
							
							... 
							
							
							
							Generate parametrize IDs for enum/re/class objects. 
							
						 
						
							2015-08-08 15:09:54 -03:00  
				
					
						
							
							
								 
						
							
								4e21d1d77b 
								
							 
						 
						
							
							
								
								Move enum import and adjust comments.  
							
							
							
						 
						
							2015-08-08 15:25:10 +02:00  
				
					
						
							
							
								 
						
							
								84fdba129a 
								
							 
						 
						
							
							
								
								More style changes.  
							
							
							
						 
						
							2015-08-08 12:57:54 +02:00  
				
					
						
							
							
								 
						
							
								18125c7d1f 
								
							 
						 
						
							
							
								
								Clean up type comparisons.  
							
							
							
						 
						
							2015-08-07 23:10:22 +02:00  
				
					
						
							
							
								 
						
							
								b59376bea4 
								
							 
						 
						
							
							
								
								Alert user about other parametrize spellings.  
							
							
							
						 
						
							2015-08-07 07:51:59 +02:00  
				
					
						
							
							
								 
						
							
								13c5456868 
								
							 
						 
						
							
							
								
								Generate parametrize IDs for enum/re/class objects.  
							
							
							
						 
						
							2015-08-07 07:37:59 +02:00  
				
					
						
							
							
								 
						
							
								f7bacd169e 
								
							 
						 
						
							
							
								
								Update docs  
							
							
							
						 
						
							2015-08-04 00:48:41 +03:00  
				
					
						
							
							
								 
						
							
								657ca97dbd 
								
							 
						 
						
							
							
								
								Some refactorings after code review  
							
							
							
						 
						
							2015-08-04 00:02:03 +03:00