f3a119c06a 
								
							 
						 
						
							
							
								
								Merge upstream/master into features  
							
							
							
						 
						
							2017-11-03 16:37:18 -02:00  
				
					
						
							
							
								 
						
							
								eaf38c7239 
								
							 
						 
						
							
							
								
								call path.read(), add tests, add news fragment  
							
							
							
						 
						
							2017-10-14 00:49:54 +08:00  
				
					
						
							
							
								 
						
							
								d40d77432c 
								
							 
						 
						
							
							
								
								Add test case for DoctestItem.reportinfo()  
							
							
							
						 
						
							2017-07-24 23:07:45 +07:00  
				
					
						
							
							
								 
						
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								4c24947785 
								
							 
						 
						
							
							
								
								Fixed E241 flake8 errors  
							
							... 
							
							
							
							multiple spaces after ‘,’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								6146ac97d9 
								
							 
						 
						
							
							
								
								Fixed E101 flake8 errors  
							
							... 
							
							
							
							indentation contains mixed spaces and tabs 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								b09d60c60a 
								
							 
						 
						
							
							
								
								Fix decode error in Python 2 for doctests in docstrings  
							
							... 
							
							
							
							Fix  #2434  
						
							2017-06-13 19:41:34 -03:00  
				
					
						
							
							
								 
						
							
								836dc451f4 
								
							 
						 
						
							
							
								
								Fix unicode issue while running doctests in Python 2  
							
							... 
							
							
							
							Fix  #2434  
						
							2017-05-26 07:35:14 -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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								402fbe503a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-12-27 23:31:26 -02:00  
				
					
						
							
							
								 
						
							
								515fb09995 
								
							 
						 
						
							
							
								
								Move module error compatibility code to _pytest.compat  
							
							
							
						 
						
							2016-12-27 22:01:22 -02:00  
				
					
						
							
							
								 
						
							
								1680eeb3a3 
								
							 
						 
						
							
							
								
								Tests: Check for ModuleNotFoundError on Python 3.6+  
							
							... 
							
							
							
							Those tests originally checked for ImportError. Since Python 3.6
ModuleNotFoundError is raised in this context instead, the tests didn't work
as they are text based (so exception inheritance does not save the day).
Fixes https://github.com/pytest-dev/pytest/issues/2132  
							
						 
						
							2016-12-27 23:15:12 +01:00  
				
					
						
							
							
								 
						
							
								f8fef07b4c 
								
							 
						 
						
							
							
								
								Fixed the tests for python 2.6  
							
							
							
						 
						
							2016-11-30 14:19:07 +01:00  
				
					
						
							
							
								 
						
							
								c043bbb854 
								
							 
						 
						
							
							
								
								Changed the doctest_encoding option to an ini option.  
							
							... 
							
							
							
							Parametrized the tests for it. 
							
						 
						
							2016-11-30 11:43:33 +01:00  
				
					
						
							
							
								 
						
							
								929912de29 
								
							 
						 
						
							
							
								
								Changed the tests to pass on python 2 as well.  
							
							
							
						 
						
							2016-11-29 14:51:17 +01:00  
				
					
						
							
							
								 
						
							
								d254c6b0ae 
								
							 
						 
						
							
							
								
								Added some tests for --docstring-encoding option. Added option to specify encoding for internal testdir._makefile() for the tests.  
							
							
							
						 
						
							2016-11-29 12:29:16 +01:00  
				
					
						
							
							
								 
						
							
								d5a70acd48 
								
							 
						 
						
							
							
								
								Simplify test in test_doctest_report_none_or_only_first_failure.  
							
							
							
						 
						
							2016-07-23 15:58:13 +02:00  
				
					
						
							
							
								 
						
							
								e229a27e8b 
								
							 
						 
						
							
							
								
								using @pytest.mark.parametrize instead of calling one test many times from another as suggested by @nicoddemus in pr  #1754  
							
							
							
						 
						
							2016-07-23 15:21:59 +02:00  
				
					
						
							
							
								 
						
							
								1a33025a76 
								
							 
						 
						
							
							
								
								Refactors test to be in its own class, as discussed with @nicoddemus.  
							
							
							
						 
						
							2016-07-23 15:16:23 +02:00  
				
					
						
							
							
								 
						
							
								fd8e019cc1 
								
							 
						 
						
							
							
								
								Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to  #1749 )  
							
							
							
						 
						
							2016-07-23 14:40:46 +02:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								ede7478dcc 
								
							 
						 
						
							
							
								
								Exit pytest on collection error (without executing tests)  
							
							... 
							
							
							
							Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
    Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes  #1421  
							
						 
						
							2016-06-21 13:32:34 +02:00  
				
					
						
							
							
								 
						
							
								74862b8f2f 
								
							 
						 
						
							
							
								
								Don't mark empty doctest files as skipped,  fixes   #1578  
							
							
							
						 
						
							2016-06-01 19:19:14 +01:00  
				
					
						
							
							
								 
						
							
								891e029518 
								
							 
						 
						
							
							
								
								Add a new doctest_namespace fixture  
							
							... 
							
							
							
							This fixture can be used to inject names into the namespace in which
your doctests run. 
							
						 
						
							2016-03-02 12:43:57 +00:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								199fcf93d4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							
							
						 
						
							2016-01-22 18:32:45 -02:00  
				
					
						
							
							
								 
						
							
								3c19cfcd9a 
								
							 
						 
						
							
							
								
								Fix decode error in Python 2.7 when docstrings contain a non-ascii character  
							
							... 
							
							
							
							Fix  #628  
						
							2016-01-08 23:10:02 -02:00  
				
					
						
							
							
								 
						
							
								bf4de4bd68 
								
							 
						 
						
							
							
								
								Merge pull request  #1294  from nicoddemus/doctest-bytes-literals  
							
							... 
							
							
							
							Doctest bytes literals 
							
						 
						
							2016-01-01 18:18:08 +01:00  
				
					
						
							
							
								 
						
							
								1bdf71730a 
								
							 
						 
						
							
							
								
								Complement  #1255  by adding tests and docs  
							
							... 
							
							
							
							Fix  #1242  
						
							2015-12-30 18:24:59 -02:00  
				
					
						
							
							
								 
						
							
								a0edbb75a4 
								
							 
						 
						
							
							
								
								Implement ALLOW_BYTES doctest option  
							
							... 
							
							
							
							Fix  #1287  
						
							2015-12-29 20:55:19 -02: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  
				
					
						
							
							
								 
						
							
								4ad56e84a8 
								
							 
						 
						
							
							
								
								Make doctest SKIP option register doctests as SKIPPED rather than PASSED  
							
							... 
							
							
							
							Fix 957 
							
						 
						
							2015-08-31 21:25:11 -03:00  
				
					
						
							
							
								 
						
							
								d749021a31 
								
							 
						 
						
							
							
								
								Fix coverage  
							
							... 
							
							
							
							Also make sure a test that doesn't set ALLOW_UNICODE fails
on Python 2 and passes Python 3. 
							
						 
						
							2015-08-12 22:49:41 -03:00  
				
					
						
							
							
								 
						
							
								420823070b 
								
							 
						 
						
							
							
								
								Add ALLOW_UNICODE doctest option  
							
							... 
							
							
							
							When enabled, the ``u`` prefix is stripped from unicode strings in
expected doctest output. This allows doctests which use unicode
to run in Python 2 and 3 unchanged.
Fix  #710  
							
						 
						
							2015-08-12 22:16:44 -03:00  
				
					
						
							
							
								 
						
							
								d6033037ac 
								
							 
						 
						
							
							
								
								Consider session fixtures for doctest docstrings in modules  
							
							... 
							
							
							
							Fixes  #768  
						
							2015-07-13 12:29:09 -03:00  
				
					
						
							
							
								 
						
							
								a0da7b9774 
								
							 
						 
						
							
							
								
								Mention issue 713 in the test's docstring  
							
							
							
						 
						
							2015-06-16 20:42:49 -03:00  
				
					
						
							
							
								 
						
							
								0b0406fa85 
								
							 
						 
						
							
							
								
								Handle reports that don't have a reprcrash  
							
							... 
							
							
							
							Closes  #713  (which happens because ReprFailDoctest
doesn't have a reprcrash) 
						
							2015-06-16 18:53:20 -04:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								1e6e373913 
								
							 
						 
						
							
							
								
								Merged in issue616 (pull request  #252 )  
							
							... 
							
							
							
							fix issue616 - conftest visibility fixes. 
							
						 
						
							2015-02-28 10:02:58 +01:00  
				
					
						
							
							
								 
						
							
								660b84a052 
								
							 
						 
						
							
							
								
								Merged in cpcloud/pytest/ignore-doctest-import-errors (pull request  #243 )  
							
							... 
							
							
							
							Add option to ignore import errors in doctests 
							
						 
						
							2015-02-26 21:59:54 +01:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
				
					
						
							
							
								 
						
							
								c773ea664b 
								
							 
						 
						
							
							
								
								Add test for command line usage  
							
							... 
							
							
							
							--HG--
branch : ignore-doctest-import-errors 
							
						 
						
							2015-02-26 12:39:36 -05:00  
				
					
						
							
							
								 
						
							
								e19f3c260f 
								
							 
						 
						
							
							
								
								Remove pdbpp xfails; don't seem necessary anymore  
							
							... 
							
							
							
							It seems that they're no longer necessary as the tests pass now
    [marca@marca-mac2 pytest]$ pip freeze
    backports.inspect==0.0.2
    fancycompleter==0.4
    funcsigs==0.2
    ordereddict==1.1
    -e hg+ssh://hg@bitbucket.org/antocuni/pdb@4bda65ac8f8cc9b1850e0301669aac39200f2f9a#egg=pdbpp-fix_pytest_doctest_NoneType_object_has_no_attribute_lower
    py==1.4.26
    Pygments==1.6
    pyrepl==0.8.4
    -e hg+ssh://hg@bitbucket.org/hpk42/pytest@5fc366c50b56a94638c959be8456d2cb3c7e7c1c#egg=pytest-dev
    wmctrl==0.1
    [marca@marca-mac2 pytest]$ py.test testing/test_doctest.py --tb=short
    ============================================================================= test session starts ==============================================================================
    platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.7.0.dev1
    collected 22 items
    testing/test_doctest.py ......................
    ========================================================================== 22 passed in 1.61 seconds ===========================================================================
See https://bitbucket.org/antocuni/pdb/issue/24/doctests-fail-when-pdbpp-is-installed 
--HG--
branch : remove_pdbpp_xfail 
							
						 
						
							2015-02-19 03:03:56 -08:00  
				
					
						
							
							
								 
						
							
								bf2f2dc2a6 
								
							 
						 
						
							
							
								
								Add a doctest for module docstrings  
							
							
							
						 
						
							2014-10-08 15:54:08 +02:00  
				
					
						
							
							
								 
						
							
								9ca7e46a0a 
								
							 
						 
						
							
							
								
								Add configuration option for doctest flags  
							
							
							
						 
						
							2014-10-08 14:31:17 +02:00