f7713c47e8
testing/conftest.py: Refactor lsof fd leak checking
...
Isolate the logic into one class to make easier to understand, more maintainable.
This may aid in later plugging in an alternative implementation, such as one
that uses psutil
(https://bitbucket.org/hpk42/pytest/pull-request/137/use-psutil-to-detect-open-files-in-tests/diff )
--HG--
branch : refactor_LsofFdLeakChecker
2014-04-01 10:15:27 -07: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
7301981f32
test_writeorg: Close a tempfile
...
--HG--
branch : test_writeorg_close_tempfile
2014-03-31 08:25:35 -07:00
555ba4159d
Simplify tests; don't use u literal not supported in py32
...
--HG--
branch : makepyfile_utf8
2014-03-28 12:11:33 -07: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
e061ace099
fix toxenv spec for py33-pexpect, thanks Daniel Grana.
2014-03-28 14:51:00 +01:00
85d52481b1
fix issue483: trial/py33 works now properly. Thanks Daniel Grana for PR.
2014-03-28 14:47:34 +01: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
0cb9d26d83
add py33-trial tox environment
2014-03-28 10:44:51 -03:00
95cc114b34
add changelog entry:
...
fix issue412: messing with stdout/stderr FD-level streams is now
captured without crashes.
2014-03-28 11:29:29 +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
a65380941d
Merged in msabramo/pytest/sys_meta_path_remove_hook_only_if_present (pull request #133 )
...
Only try to remove hook from sys.meta_path if it's present
2014-03-28 09:10:58 +01:00
17d7c60735
test_sys_meta_path_munged: Simplify with makepyfile
...
--HG--
branch : sys_meta_path_remove_hook_only_if_present
2014-03-28 01:03:52 -07: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
0b340aa1f6
simplify some capturing tests
2014-03-28 07:55:07 +01:00
859915dc5e
simplify capturing funcarg handling
2014-03-28 07:13:08 +01:00
a8f4f49a82
simplify reset/stop_capturing and fix capturing wrt to capturing simple os.write() calls
2014-03-28 07:11:25 +01:00
e18c3ed494
unify and normalize Sys/FD Capturing classes
...
* * *
more unification
2014-03-28 07:03:37 +01:00
2263fcf6b7
remove unused "suspend/resume" on capturing, some formatting cleanup
2014-03-28 07:03:34 +01:00
b96d552dbd
no need for im_func and it does not exists in python3
2014-03-27 23:57:18 -03:00
2b2c1e5b7b
condition for python3 of the xfailing test for 412
2014-03-27 14:01:38 +01:00
7b63fa5966
merge in current default
2014-03-27 13:57:54 +01:00
b18040337a
xfailing test for issue 412
2014-03-27 13:53:59 +01:00
42e0d7970c
Merged in nloadholtes/pytest/nloadholtes/slight-change-to-the-wording-for-readabi-1395890493571 (pull request #131 )
...
Slight change to the wording for readability
2014-03-27 06:40:35 +01:00
ed0a4fe23b
Slight change to the wording for readability
...
--HG--
branch : nloadholtes/slight-change-to-the-wording-for-readabi-1395890493571
2014-03-27 03:21:58 +00:00
bb0632c7ad
extend test
2014-03-26 19:37:49 +01:00
84ab194516
add changelog: merge PR123: improved integration with mock.patch decorator on tests.
2014-03-26 19:06:56 +01:00
530cae9204
Merged in cgilling/pytest (pull request #123 )
...
Fix to work properly when @patch is used with new not equal to DEFAULT
2014-03-26 19:05:46 +01:00
9dc43e84dc
Merged in msabramo/pytest/help_show_args_with_equals_instead_of_space (pull request #130 )
...
_pytest/config.py: In --help, show args with `=` instead of space.
2014-03-26 19:04:35 +01:00
8af265da04
_pytest/config.py: In --help, show args with `=` instead of space.
...
The `=` is better because it encourages folks to use the form that doesn't
suffer from issue #436 (https://bitbucket.org/hpk42/pytest/issue/436 ), which
can cause the arg to be treated as an "anchor" and used as the (unexpected)
path for searching for conftest.py files.
--HG--
branch : help_show_args_with_equals_instead_of_space
2014-03-26 10:47:30 -07:00
e3b9382122
use sys.modules.get correctly and reference DEFAULT with respect to it
2014-03-26 09:36:02 -07:00
c3f4eb6d57
change try/except to sys.module.get and a conditional
2014-03-26 09:27:33 -07:00
892aa457be
fix issue472: clarify that ``pytest.config.getvalue()`` cannot work
...
if it's triggered ahead of command line parsing.
2014-03-26 07:15:54 +01:00
8f7b53e55b
fix issue490: include pytest_load_initial_conftests in documentation
...
and improve docstring.
2014-03-25 14:43:58 +01:00
d27c377817
tentatively fix py33 and py25 compat
2014-03-14 15:58:16 +01:00
50abe43216
fix issue #479 : properly handle nose/unittest(2) SkipTest exceptions
...
during collection/loading of test modules. Thanks to Marc Schlaich
for the complete PR.
2014-03-14 15:44:39 +01:00
ddc67ca13a
Merged in schlamar/pytest (pull request #129 )
...
Fixed race condition with SkipTest when module not in sys.modules on collection.
2014-03-14 15:39:01 +01:00
a1d3da4027
Merged in nicoddemus/pytest/integrate-plugin-index-docs (pull request #120 )
...
Integrating plugin_index docs and misc improvements
2014-03-14 15:34:03 +01:00
85e7b11ef5
Removed unnecessary iteration in nose.pytest_runtest_makereport.
2014-03-14 15:29:42 +01:00
77e1f93ca1
Fixed pyflakes errors.
2014-03-14 14:25:36 +01:00
94b1ce65c6
Fixed race condition with SkipTest when module not in sys.modules on collection.
2014-03-14 14:04:54 +01:00
f5b992f68a
Merged in jurko/pytest/doc_typo_correction (pull request #122 )
...
fix documentation typo
2014-03-14 13:10:33 +01:00
24a458b4c8
Merged in graingert/pytest/graingert/pep8-good-practices-code-1394196858258 (pull request #125 )
...
pep8 good practices code
2014-03-14 13:06:53 +01:00
Marc Abramowitz
holger krekel
Daniel Grana
Ronny Pfannschmidt
Nick Loadholtes
Chris Gilling
schlamar