dc65aa1fea 
								
							 
						 
						
							
							
								
								avoid importing old assertion interpretation code by default ( fixes   #537 )  
							
							
							
						 
						
							2014-07-16 17:21:18 -07:00  
				
					
						
							
							
								 
						
							
								80ad3fb8ed 
								
							 
						 
						
							
							
								
								Merged in wooparadog/pytest (pull request  #163 )  
							
							... 
							
							
							
							Also replace `report.longrepr` with `bin_xml_escape`ed skipreason 
							
						 
						
							2014-07-15 22:17:15 +02:00  
				
					
						
							
							
								 
						
							
								d0b048c86d 
								
							 
						 
						
							
							
								
								Merged in msabramo/pytest/norecursedirs_add_star_dot_egg (pull request  #177 )  
							
							... 
							
							
							
							Add *.egg to default for norecursedirs 
							
						 
						
							2014-07-03 16:51:17 +02:00  
				
					
						
							
							
								 
						
							
								b6f069f4c3 
								
							 
						 
						
							
							
								
								Add *.egg to default for norecursedirs  
							
							... 
							
							
							
							--HG--
branch : norecursedirs_add_star_dot_egg 
							
						 
						
							2014-07-03 07:49:03 -07:00  
				
					
						
							
							
								 
						
							
								e19462d581 
								
							 
						 
						
							
							
								
								fix ordering of import line of last commit  
							
							
							
						 
						
							2014-07-03 13:20:51 +02:00  
				
					
						
							
							
								 
						
							
								a811fabb43 
								
							 
						 
						
							
							
								
								avoid importing "py.test" (an old alias module for "pytest")  
							
							
							
						 
						
							2014-07-03 12:58:12 +02:00  
				
					
						
							
							
								 
						
							
								07e76cbef2 
								
							 
						 
						
							
							
								
								fix issue364: shorten and enhance tracebacks representation by default.  
							
							... 
							
							
							
							The new "--tb=auto" option (default) will only display long tracebacks
for the first and last entry.  You can get the old behaviour of printing
all entries as long entries with "--tb=long".  Also short entries by
default are now printed very similarly to "--tb=native" ones. 
							
						 
						
							2014-06-29 13:32:53 +02:00  
				
					
						
							
							
								 
						
							
								b7f6a9f3fd 
								
							 
						 
						
							
							
								
								Cleaner implementation of early handling of the '-c' command line switch.  
							
							... 
							
							
							
							--HG--
branch : explicit-ini-filename 
							
						 
						
							2014-06-28 12:03:55 +02:00  
				
					
						
							
							
								 
						
							
								c8264385ea 
								
							 
						 
						
							
							
								
								Implement the "-c" command line switch that allows to explicitly specifiy the config file to load.  
							
							... 
							
							
							
							This feature was requested in issue #174 .
--HG--
branch : explicit-ini-filename 
							
						 
						
							2014-06-27 17:42:37 +02:00  
				
					
						
							
							
								 
						
							
								4bc4495115 
								
							 
						 
						
							
							
								
								Fixed typo noticed by @dcramer ( https://twitter.com/zeeg/status/473676721128886272 )  
							
							... 
							
							
							
							--HG--
branch : zyegfryed/fixed-typo-noticed-by-dcramer-httpstwitt-1401780587159 
							
						 
						
							2014-06-03 07:30:14 +00:00  
				
					
						
							
							
								 
						
							
								c66e9f8f0f 
								
							 
						 
						
							
							
								
								fix typo, thanks @dcramer  
							
							
							
						 
						
							2014-06-03 07:21:02 +02:00  
				
					
						
							
							
								 
						
							
								780bdda95a 
								
							 
						 
						
							
							
								
								assert reinterpretation: try mangling attributes that look like private class vars ( fixes   #514 )  
							
							
							
						 
						
							2014-05-31 14:37:02 -07:00  
				
					
						
							
							
								 
						
							
								d6281b4206 
								
							 
						 
						
							
							
								
								- restore compatibility to old getvalueorskip behaviour  
							
							... 
							
							
							
							- introduce a better NOTSET representation to improve docs 
							
						 
						
							2014-05-14 07:36:31 +02:00  
				
					
						
							
							
								 
						
							
								9263f30c88 
								
							 
						 
						
							
							
								
								use py.builtin.callable instead of raw callable in _pytest/runner.py  
							
							... 
							
							
							
							This is consistent with how callable() is called from the rest of pytest code
(see _pytest/nose.py & _pytest/python.py) plus, as a nice side-effect, it
makes pytest work correctly on Python 3.1.
--HG--
branch : python 3.1 fix 
							
						 
						
							2014-05-13 21:05:53 +02:00  
				
					
						
							
							
								 
						
							
								468b1241a5 
								
							 
						 
						
							
							
								
								fix issue512: show "<notset>" for arguments which might not be set  
							
							... 
							
							
							
							in monkeypatch plugin.  Improves output in documentation. 
							
						 
						
							2014-05-10 13:49:24 +02:00  
				
					
						
							
							
								 
						
							
								580c8525f0 
								
							 
						 
						
							
							
								
								Use processced skipreason for generating skip Junit node  
							
							
							
						 
						
							2014-04-23 15:38:40 +08:00  
				
					
						
							
							
								 
						
							
								d6010aa0c9 
								
							 
						 
						
							
							
								
								Also replace `report.longrepr` with `bin_xml_escape`ed skipreason  
							
							
							
						 
						
							2014-04-23 14:50:21 +08:00  
				
					
						
							
							
								 
						
							
								c47835f5ec 
								
							 
						 
						
							
							
								
								Merge pull request  #158 , fixes issue 504  
							
							
							
						 
						
							2014-04-15 11:43:38 -04:00  
				
					
						
							
							
								 
						
							
								faba432996 
								
							 
						 
						
							
							
								
								Improve error message if pytest.raises is used wrongly  
							
							... 
							
							
							
							If the type is not checked then an incomprehensible error will occur
later.  This enforces the type and raies the same exception/msg as
CPython does in that case.
Docstring unmodified, just re-justified for pep8 compat. 
							
						 
						
							2014-04-14 18:09:10 -04:00  
				
					
						
							
							
								 
						
							
								2ba23e8d08 
								
							 
						 
						
							
							
								
								issue504: verbose output displays node IDs for each test  
							
							... 
							
							
							
							Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.
This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.
--HG--
branch : issue504 
							
						 
						
							2014-04-14 17:42:02 -04:00  
				
					
						
							
							
								 
						
							
								9711e335d9 
								
							 
						 
						
							
							
								
								Change XPASS colour to be yellow rather then red  
							
							... 
							
							
							
							Unfortunately I'm not sure how to test this. 
							
						 
						
							2014-04-12 10:27:12 -04:00  
				
					
						
							
							
								 
						
							
								15af7e1662 
								
							 
						 
						
							
							
								
								fix tests to properly fail on failed collectiosn (which was hiding an error)  
							
							... 
							
							
							
							and also implement __test__=False for test functions properly.
--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 13:37:39 +02:00  
				
					
						
							
							
								 
						
							
								494be731e3 
								
							 
						 
						
							
							
								
								support nose-style ``__test__`` attribute on modules, classes and  
							
							... 
							
							
							
							functions, including unittest-style Classes.  If set to True, the
test will not be collected.
--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 12:46:27 +02:00  
				
					
						
							
							
								 
						
							
								f91049cec9 
								
							 
						 
						
							
							
								
								fix issue473: work around mock putting an unbound method into a class  
							
							... 
							
							
							
							dict when double-patching.
--HG--
branch : issue473 
							
						 
						
							2014-04-08 12:50:13 +02:00  
				
					
						
							
							
								 
						
							
								ef7cb47b1e 
								
							 
						 
						
							
							
								
								fix issue498: if a fixture finalizer fails, make sure that the fixture  
							
							... 
							
							
							
							is still invalidated.
--HG--
branch : issue498 
							
						 
						
							2014-04-07 13:29:57 +02:00  
				
					
						
							
							
								 
						
							
								28aa4c891e 
								
							 
						 
						
							
							
								
								bump version to 2.6.0.dev1 because i think we are going for a 2.6.0 release next  
							
							... 
							
							
							
							and not just a 2.5 maintenance one. 
							
						 
						
							2014-04-03 22:27:04 +02:00  
				
					
						
							
							
								 
						
							
								52851e4388 
								
							 
						 
						
							
							
								
								Merged in jurko/pytest/fix_capfd_fixture_docstring (pull request  #149 )  
							
							... 
							
							
							
							correct a capfd fixture docstring typo 
							
						 
						
							2014-04-03 10:02:00 +02:00  
				
					
						
							
							
								 
						
							
								cbe31f3748 
								
							 
						 
						
							
							
								
								Merged in msabramo/pytest/makepyfile_utf8 (pull request  #134 )  
							
							... 
							
							
							
							Make makepyfile accept UTF-8 so a few cookie tests in test_assertrewrite.py 
							
						 
						
							2014-04-03 10:00:24 +02:00  
				
					
						
							
							
								 
						
							
								c9bbdf4f10 
								
							 
						 
						
							
							
								
								correct a capfd fixture docstring typo  
							
							... 
							
							
							
							--HG--
branch : fix_capfd_fixture_docstring 
							
						 
						
							2014-04-03 09:59:04 +02:00  
				
					
						
							
							
								 
						
							
								f984e94fca 
								
							 
						 
						
							
							
								
								Merged in jurko/pytest/break_ExceptionInfo_reference_cycles (pull request  #144 )  
							
							... 
							
							
							
							break reference cycles caused by storing local reference to exception info 
							
						 
						
							2014-04-03 09:47:41 +02:00  
				
					
						
							
							
								 
						
							
								b4fe91943d 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-hpk/conftest-clean (pull request  #148 )  
							
							... 
							
							
							
							cleanup internal conftest handling and avoid the strange None entry in the conftest cache. 
							
						 
						
							2014-04-03 09:38:47 +02:00  
				
					
						
							
							
								 
						
							
								0365e5c3a0 
								
							 
						 
						
							
							
								
								cleanup internal conftest handling and avoid the strange None entry in the conftest cache.  
							
							... 
							
							
							
							(There is basically no reason to ask for conftestmodules without specifying a path.)
--HG--
branch : conftest-clean 
							
						 
						
							2014-04-02 22:30:45 +02:00  
				
					
						
							
							
								 
						
							
								51cff6f106 
								
							 
						 
						
							
							
								
								fix issue486: better reporting and handling of early conftest loading failures  
							
							... 
							
							
							
							--HG--
branch : issue486 
							
						 
						
							2014-04-02 20:42:41 +02:00  
				
					
						
							
							
								 
						
							
								adb12d0d4f 
								
							 
						 
						
							
							
								
								Escape newlines in result from assertrepr hook  
							
							... 
							
							
							
							The result from the pytest_assertrepr_compare hook should not include
any newlines since that will confuse the mini-formatting language used
by assertion.util.format_explanation.  So simply escape the included
newlines, this way hook writers do not have to worry about this at
all.
Fixes issue 453. 
							
						 
						
							2014-04-02 17:35:22 +01:00  
				
					
						
							
							
								 
						
							
								844c141d10 
								
							 
						 
						
							
							
								
								Style fixes for pep8  
							
							... 
							
							
							
							Includes a quotation change for consistent style. 
							
						 
						
							2014-04-02 17:16:37 +01:00  
				
					
						
							
							
								 
						
							
								98ea8fae32 
								
							 
						 
						
							
							
								
								break reference cycles caused by storing local reference to exception info  
							
							... 
							
							
							
							Such reference cycles unnecessarily cause Python interpreter not to garbage
collect the objects referenced in those cycles as soon they could be collected,
and in turn cause the tests to use more memory than is strictly necessary.
--HG--
branch : break_ExceptionInfo_reference_cycles 
							
						 
						
							2014-04-02 15:34:36 +02:00  
				
					
						
							
							
								 
						
							
								3bca62e9e4 
								
							 
						 
						
							
							
								
								fix issue436: improved finding of initial conftest files from command  
							
							... 
							
							
							
							line arguments by using the result of parse_known_args rather than
the previous flaky heuristics.  Thanks Marc Abramowitz for tests
and initial fixing approaches in this area. 
							
						 
						
							2014-04-02 11:29:23 +02:00  
				
					
						
							
							
								 
						
							
								8e4e2ba244 
								
							 
						 
						
							
							
								
								merge main  
							
							
							
						 
						
							2014-04-01 15:06:44 +02:00  
				
					
						
							
							
								 
						
							
								3b8935c533 
								
							 
						 
						
							
							
								
								remove dupped_stdout logic and related changes, also simplify pytest_runtest_* calls to not use a contextlib with-decorator anymore.  
							
							
							
						 
						
							2014-04-01 15:03:17 +02:00  
				
					
						
							
							
								 
						
							
								ce8678e6d5 
								
							 
						 
						
							
							
								
								remove non-documented per-conftest capturing option and simplify/refactor all code accordingly.  Also make capturing more robust against tests closing FD1/2 and against pdb.set_trace() calls.  
							
							
							
						 
						
							2014-04-01 14:32:12 +02:00  
				
					
						
							
							
								 
						
							
								2e1f6c85f6 
								
							 
						 
						
							
							
								
								introduce resume/suspend functionality for FDCapture and SysCapture,  
							
							... 
							
							
							
							fixing problems with early bailouts (from argparse's parse() function e.g.)
that wrote to stdout. 
							
						 
						
							2014-04-01 14:19:58 +02:00  
				
					
						
							
							
								 
						
							
								ca5e6830c6 
								
							 
						 
						
							
							
								
								avoid some redundancy by using SysCapture from FDCapture for manipulating sys.std{out,in,err}  
							
							
							
						 
						
							2014-04-01 14:19:55 +02:00  
				
					
						
							
							
								 
						
							
								69cbac8fb5 
								
							 
						 
						
							
							
								
								rename StdCaptureBase to MultiCapture  
							
							
							
						 
						
							2014-04-01 14:19:52 +02:00  
				
					
						
							
							
								 
						
							
								f47ae74981 
								
							 
						 
						
							
							
								
								Make makepyfile accept UTF-8 so a few cookie tests in test_assertrewrite.py  
							
							... 
							
							
							
							don't need to be dedented.
--HG--
branch : makepyfile_utf8 
							
						 
						
							2014-03-28 09:44:18 -07:00  
				
					
						
							
							
								 
						
							
								47379d4a79 
								
							 
						 
						
							
							
								
								Merged in dangra/pytest (pull request  #132 )  
							
							... 
							
							
							
							no need for im_func and it does not exists in python3 
							
						 
						
							2014-03-28 14:46:34 +01:00  
				
					
						
							
							
								 
						
							
								9d716a39d6 
								
							 
						 
						
							
							
								
								fix issue412 and other encoding issues.  Streamline dupfile() into  
							
							... 
							
							
							
							a new more thoughtful safe_text_dupfile helper. 
							
						 
						
							2014-03-28 11:27:02 +01:00  
				
					
						
							
							
								 
						
							
								923dcfd620 
								
							 
						 
						
							
							
								
								cleanup and refine issue412 test (still failing on py33)  
							
							
							
						 
						
							2014-03-28 09:46:38 +01:00  
				
					
						
							
							
								 
						
							
								b5467645d3 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2014-03-28 09:27:44 +01:00  
				
					
						
							
							
								 
						
							
								81f822d528 
								
							 
						 
						
							
							
								
								Only try to remove hook from sys.meta_path if it's present  
							
							... 
							
							
							
							Prevent error on exit if some code messes with sys.meta_path and removes the
assertionrewrite hook (CaptureMock seems to do this):
      File "/Users/marca/dev/hg-repos/pytest/_pytest/assertion/__init__.py", line 64, in pytest_unconfigure
        sys.meta_path.remove(hook)
    ValueError: list.remove(x): x not in list
--HG--
branch : sys_meta_path_remove_hook_only_if_present 
							
						 
						
							2014-03-28 00:33:12 -07:00  
				
					
						
							
							
								 
						
							
								859915dc5e 
								
							 
						 
						
							
							
								
								simplify capturing funcarg handling  
							
							
							
						 
						
							2014-03-28 07:13:08 +01:00