jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,182 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

917 Commits

Author SHA1 Message Date
Bruno Oliveira d59786fcc4
Merge pull request #4222 from RonnyPfannschmidt/pathlib-fixes 
handle race condition when creation and deletion of a numbered dir overlap
 2018-10-26 14:36:43 -03:00
Ankit Goel af34164858
Fix changelog file extension 2018-10-26 22:03:57 +05:30
Jon Dufresne 167e9b954a Remove use of unnecessary compat shim, six.binary_type 
The type `bytes` is available on all supported Python versions. On
Python 2.7, it is an alias of str, same as six.binary_type.

Makes the code slightly more forward compatible.
 2018-10-26 06:27:50 -07:00
Ronny Pfannschmidt ae2fc27799 handle test folder cleanup being unable to create a cleanup lock 2018-10-26 14:31:54 +02:00
Ronny Pfannschmidt ce0b0518c7 fix #4243 - support positional argument stacklevel on python2 2018-10-26 09:01:25 +02:00
Anthony Sottile 777e9e1e17 Merge remote-tracking branch 'origin/master' into merge-master 2018-10-25 18:00:39 -07:00
Anthony Sottile 1af31a09f4 Add a changelog for #4235 [ci skip] 2018-10-25 09:09:25 -07:00
Daniel Hahler ede3a4e850 pytest_{enter,leave}_pdb: pass through pdb instance 2018-10-25 13:28:24 +02:00
Daniel Hahler a4ea66cb1f pdb: resume capturing after `continue` 
After `pdb.set_trace()` capturing is turned off.
This patch resumes it after using the `continue` (or `c` / `cont`)
command.

Store _pytest_capman on the class, for pdbpp's do_debug hack to keep it.

Without this, `debug …` would fail like this:

    /usr/lib/python3.6/cmd.py:217: in onecmd
        return func(arg)
    .venv/lib/python3.6/site-packages/pdb.py:608: in do_debug
        return orig_do_debug(self, arg)
    /usr/lib/python3.6/pdb.py:1099: in do_debug
        sys.call_tracing(p.run, (arg, globals, locals))
    /usr/lib/python3.6/bdb.py:434: in run
        exec(cmd, globals, locals)
    /usr/lib/python3.6/bdb.py:51: in trace_dispatch
        return self.dispatch_line(frame)
    /usr/lib/python3.6/bdb.py:69: in dispatch_line
        self.user_line(frame)
    /usr/lib/python3.6/pdb.py:261: in user_line
        self.interaction(frame, None)
    .venv/lib/python3.6/site-packages/pdb.py:203: in interaction
        self.setup(frame, traceback)
    E   AttributeError: 'PytestPdb' object has no attribute '_pytest_capman'

- add pytest_leave_pdb hook
- fixes test_pdb_interaction_capturing_twice: would fail on master now,
  but works here
 2018-10-25 13:28:24 +02:00
Bruno Oliveira 2ad43ee442 Show node that originated a warning in the warnings summary 
Fix #4221
 2018-10-24 18:49:53 -03:00
Bruno Oliveira b6fa4e248f
Merge pull request #4028 from asottile/revert_breakpoint_code 
Revert patching of breakpointhook as it appears to do nothing
 2018-10-24 17:50:19 -03:00
Daniel Hahler eee8201e4f Merge remote-tracking branch 'origin/master' into merge-master 2018-10-24 22:36:34 +02:00
Daniel Hahler f8f4c16020 TerminalWriter: write "collecting" msg only once every 0.1s 
Running `pytest -k doesnotmatch` on pytest's own tests takes ~3s with
Kitty terminal for me, but only ~1s with `-q`.
It also is faster with urxvt, but still takes 2.2s there.

This patch only calls `report_collect` every 0.1s, which is good enough
for reporting collection progress, and improves the time with both Kitty
and urxvt to ~1.2s for me.
 2018-10-24 16:48:35 +02:00
Bruno Oliveira 8bced7415c
Merge pull request #4220 from anpr/doc_raise_on_empty_parameterset 
Add `empty_parameter_set_mark` ini option documentation to the parametrize doc
 2018-10-23 19:10:44 -03:00
Andreas Profous 0dd85157ea Add reference to ``empty_parameter_set_mark`` parametrize doc 2018-10-23 22:03:05 +02:00
Daniel Hahler fadac0ffc0 Fix "Plugin already registered" error with symlinks 
Fixes https://github.com/pytest-dev/pytest/issues/4174.
 2018-10-23 10:15:23 +02:00
Bruno Oliveira 771e860011 Preparing release version 3.9.2 2018-10-22 21:47:42 +00:00
Ankit Goel cd72e23f3f
Merge pull request #4207 from nicoddemus/recursive-dep-fixtures 
Improve error message when a recursive dependency between fixtures is detected
 2018-10-20 22:19:21 +05:30
Bruno Oliveira 7bb51b8ceb Issue a warning when a fixture named 'request' is collected 
Fix #611
 2018-10-20 12:09:44 -03:00
Bruno Oliveira b9990f77ff
Merge pull request #4204 from vbarbaresi/3340_log_hooks 
Fix logging usage in hooks pytest_sessionstart/finish
 2018-10-20 11:36:06 -03:00
Bruno Oliveira 02ae7d8531 Improve error message when a recursive dependency between fixtures is detected 
Fix #2909
 2018-10-20 09:44:42 -03:00
Bruno Oliveira f947cb2613 Merge remote-tracking branch 'upstream/features' into davidszotten/stepwise 2018-10-20 09:18:02 -03:00
Vincent Barbaresi db106d6085 Fix logging usage in hooks pytest_sessionstart/finish #3340 2018-10-20 09:55:10 +02:00
Bruno Oliveira 2abd005cc9
Merge pull request #4195 from nicoddemus/issue-3691 
Use safe_str() to format warning message about unicode in Python 2
 2018-10-19 07:18:29 -03:00
Anthony Sottile dc0b4efffa
Merge pull request #4196 from nicoddemus/better-signature-error-msg-4026 
Improve error message when it is not possible to determine a function's signature
 2018-10-18 18:56:55 -07:00
Bruno Oliveira 18035211f5 Use safe_str() to format warning message about unicode in Python 2 
Fix #3691
 2018-10-18 21:56:17 -03:00
Anthony Sottile 61080da89d
Merge pull request #4192 from asottile/fix_recwarn_stacklevel 
Fix filename reported by `warnings.warn` when using `recwarn` under python2.
 2018-10-18 16:22:00 -07:00
Bruno Oliveira ac5704290f Improve error message when it is not possible to determine a function's signature 
Fix #4026
 2018-10-18 20:06:43 -03:00
Bruno Oliveira b432f1207c
Merge pull request #4190 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-10-18 19:23:16 -03:00
Anthony Sottile cdd0e18ca8 Emulate resetting the warnings registry for python 2.x 2018-10-18 10:43:05 -07:00
Sven-Hendrik Haase f694d8d6ad Make --color more colorful 2018-10-18 03:56:58 +02:00
Bruno Oliveira a83ee197c6 Merge remote-tracking branch 'upstream/master' into RonnyPfannschmidt/bump-setuptools 2018-10-17 19:05:52 -03:00
Ronny Pfannschmidt cc335d44a0 fix #4179 - bring back the current testrun symlink 2018-10-17 20:43:27 +02:00
Ronny Pfannschmidt 4f4c91caf5 fix #4177 - pin setuptools>=40.0 2018-10-17 20:08:07 +02:00
Bruno Oliveira ee0a306ee4 Merge remote-tracking branch 'upstream/features' into merge-features-into-master 2018-10-16 17:41:27 -03:00
Ronny Pfannschmidt 253c5786af Preparing release version 3.9.1 2018-10-16 22:16:58 +02:00
Ronny Pfannschmidt c4550bc922 Merge branch 'release-3.9.0' of github.com:nicoddemus/pytest into release-3.9.1 2018-10-16 22:07:38 +02:00
Ankit Goel f858177495
Merge pull request #4167 from vbarbaresi/3533_junit_escape_skipped 
Fix #3533: properly escape raw XML object
 2018-10-16 21:10:42 +05:30
Bruno Oliveira 54b8ad4554
Merge pull request #4159 from thisch/subclassedfile 
Increase required verbosity level for debug output
 2018-10-16 10:41:27 -03:00
Vincent Barbaresi d72154acda add changelog for #3533 2018-10-16 15:07:23 +02:00
Bruno Oliveira 2868c31495 Preparing release version 3.9.0 2018-10-15 20:23:30 +00:00
David Szotten 4f652c9045 we have a pr number now 2018-10-15 20:04:39 +01:00
David Szotten 8c059dbc48 draft changelog 2018-10-15 20:04:39 +01:00
Thomas Hisch e8c220b9bd Increase required verbosity level for debug output 
To show the subclassed file in legacy test suits in the runtest output
you have to set the verbosity level to at least "-vv" now.

Closes #3211
 2018-10-15 20:38:32 +02:00
Bruno Oliveira 9646a1cd7a Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-15 12:55:28 -03:00
Anthony Sottile 093e19a7d9
Merge pull request #4153 from asottile/syntax_warning_filename 
Display the filename when encountering `SyntaxWarning`.
 2018-10-15 08:40:51 -07:00
Bruno Oliveira 58b6e8616c
Merge pull request #4149 from RonnyPfannschmidt/modern-build 
modernize packaging for setuptools>30.3
 2018-10-15 08:13:47 -03:00
Tomer Keren 99d957bd3d Check off PR requirements 2018-10-15 11:36:31 +03:00
Ankit Goel 141c51f0cb
Merge pull request #4145 from labcodes/4098 
Add returncode argument to pytest.exit
 2018-10-15 11:04:11 +05:30
Ronny Pfannschmidt d65c7658d5 changelog 2018-10-15 07:32:38 +02:00
Anthony Sottile 2e42d937dc Display the filename when encountering `SyntaxWarning`. 
```console
$ cd t && rm -rf __pycache__ && pytest t.py -q -c /dev/null; cd ..
.                                                                        [100%]
=============================== warnings summary ===============================
<unknown>:2: DeprecationWarning: invalid escape sequence \.

-- Docs: https://docs.pytest.org/en/latest/warnings.html
1 passed, 1 warnings in 0.01 seconds

```

```console
$ cd t && rm -rf __pycache__ && pytest t.py -q -c /dev/null; cd ..
.                                                                        [100%]
=============================== warnings summary ===============================
/tmp/pytest/t/t.py:2: DeprecationWarning: invalid escape sequence \.
  '\.wat'

-- Docs: https://docs.pytest.org/en/latest/warnings.html
1 passed, 1 warnings in 0.01 seconds
```
 2018-10-14 16:11:47 -07:00
Jose Carlos Menezes bbd1cbb0b3 Update changelog to better reading 2018-10-14 18:03:37 -03:00
Ronny Pfannschmidt 1dfa303b1e fix #4135 - handle symlinks in tmp path cleanup 2018-10-14 21:20:34 +02:00
Jose Carlos Menezes a0666354dd Update changelog 2018-10-14 12:29:19 -03:00
Daniel Hahler 3bfaa8ab84
Merge pull request #4132 from blueyed/pdb-internal-dupe 
Do not print (duplicate) INTERNALERROR with --pdb.
 2018-10-14 11:25:35 +02:00
Bruno Oliveira 9fb305b17b
Merge pull request #4086 from jeffreyrack/4063-exclude-0-durations 
Exclude durations that are 0.00 seconds long.
 2018-10-13 22:16:04 -03:00
Daniel Hahler 7268462b33 Resolve symlinks for args 
This fixes running `pytest tests/test_foo.py::test_bar`, where `tests`
is a symlink to `project/app/tests`: previously
`project/app/conftest.py` would be ignored for fixtures then.
 2018-10-13 23:59:05 +02:00
Daniel Hahler 448830e656 Do not print INTERNALERROR with --pdb 
This gets printed by the terminal reporter already, and currently
results in the same error being displayed twice, e.g. when raising an
`Exception` manually from `pytest.debugging.pytest_exception_interact`.
 2018-10-13 23:56:34 +02:00
Jeffrey Rackauckas 47f5c29002 Update messaging for --durations when not in verbose mode. 2018-10-13 12:51:04 -07:00
Bruno Oliveira 24c83d725a
Merge pull request #4129 from nicoddemus/merge-master-into-features 
Merge master into features (prepare for 3.9)
 2018-10-13 12:05:54 -03:00
Bruno Oliveira 29d5849519 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-13 08:50:32 -03:00
Bruno Oliveira 8e11fe5304 Improve tracebacks for ImportErrors in conftest.py files 
Fix #3332
 2018-10-12 10:10:55 -03:00
Jose Carlos Menezes dbaa9464ba Update usefixtures documentation 
Clarifying that it can't be used with fixture functions
 2018-10-12 09:45:49 -03:00
Bruno Oliveira 933de16fe4
Merge pull request #3988 from RonnyPfannschmidt/tmpdir-port-pathlib 
Tmpdir port pathlib
 2018-10-12 08:33:47 -03:00
Bruno Oliveira e8348a1d12
Merge pull request #4077 from nicoddemus/short-usage-errors 
Improve internal error messages
 2018-10-12 08:18:07 -03:00
Ronny Pfannschmidt 4736b2bdfb address review comments 2018-10-11 20:48:30 +02:00
Ronny Pfannschmidt ad6f63edda add changelog 2018-10-11 07:15:09 +02:00
Bruno Oliveira c9a85b0e78 Fix linting 2018-10-10 19:54:39 -03:00
Bruno Oliveira bf265a424d Minor adjustments found during code review 2018-10-10 19:35:49 -03:00
Bruno Oliveira 5436e42990 Use pytest.fail(..., pytrace=False) when treating user errors 
This prevents an enormous and often useless stack trace from showing
to end users.

Fix #3867
Fix #2293
 2018-10-10 19:16:53 -03:00
Anthony Sottile dbfb3ccc42 Add changelog entry 2018-10-10 10:46:09 -07:00
Niklas JQ d1322570dd Fix issue 4093 2018-10-10 19:45:07 +02:00
Anthony Sottile e0f6fce9e9 In python2, display previously warned warnings 2018-10-10 09:37:21 -07:00
Anthony Sottile aeb92accb2 Implement pytest.deprecated_call with pytest.warns 2018-10-10 08:03:23 -07:00
Bruno Oliveira 9a3836a0cf Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-09 19:34:04 -03:00
Jeffrey Rackauckas fc11b81005 Exclude durations that are 0.00 seconds long. 2018-10-07 19:19:48 -07:00
Ronny Pfannschmidt 66609665f2
Merge pull request #4076 from nicoddemus/unittest-param-fixture-msg 
Improve error message when TestCase functions use a parametrized fixture
 2018-10-06 07:43:57 +02:00
Kyle Altendorf 5ecbb0acba Correct new changelog to have newline at end 2018-10-05 10:22:07 -04:00
Kyle Altendorf ee64f1fb9f Add changelog file for 4073 2018-10-05 10:02:59 -04:00
Bruno Oliveira a1208f5631
Merge pull request #4075 from nicoddemus/dynamic-fixturenames 
Fix request.fixturenames to return fixtures created dynamically
 2018-10-04 09:21:23 -03:00
Anthony Sottile b098292352
Merge pull request #4069 from asottile/deindent_4066 
Fix source reindenting by using `textwrap.dedent` directly.
 2018-10-03 16:11:51 -07:00
Bruno Oliveira 212937eb3e Improve error message when TestCase functions use a parametrized fixture 
Fix #2535
 2018-10-03 19:43:46 -03:00
Bruno Oliveira 70c7273640 Fix request.fixturenames to return fixtures created dynamically 
Fix #3057
 2018-10-03 18:50:14 -03:00
Palash Chatterjee f9ac60807c Fixes #4064 by correcting the documentation for unit-tests 2018-10-03 18:11:09 +05:30
Bruno Oliveira 3f03625a5d
Merge pull request #4070 from jeffreyrack/4058-update-fixture-docs 
Update documentation to indicate a fixture can be invoked more than once in it's scope.
 2018-10-03 08:39:41 -03:00
Jeffrey Rackauckas 642847c079 Update documentation on fixture being invoked more than once in a scope. 2018-10-02 20:53:15 -07:00
Anthony Sottile f102ccc8f0 Fix source reindenting by using `textwrap.dedent` directly. 2018-10-02 16:13:35 -07:00
Anthony Sottile d3673c7429 Preparing release version 3.8.2 2018-10-02 07:46:02 -07:00
Bruno Oliveira 25fe3706a4
Merge pull request #4056 from nicoddemus/unicode-vars 
Ensure Monkeypatch setenv and delenv use bytes keys in Python 2
 2018-10-02 07:56:32 -03:00
Bruno Oliveira 5e7d427df1
Merge pull request #4060 from nicoddemus/4051-changelog 
Improve changelog for #4051
 2018-10-01 18:12:52 -03:00
Bruno Oliveira 20d0f0e56b Improve changelog for #4051 2018-10-01 17:12:05 -03:00
Bruno Oliveira d24a7e6c5a Issue warning if Monkeypatch.setenv/delenv receive non-strings in Python 2 
Fixes the bug described in:

	https://github.com/tox-dev/tox/pull/1025#discussion_r221273830

Which is more evident when using `unicode_literals`.
 2018-10-01 17:05:30 -03:00
Jose Carlos Menezes 4dc73bda45 Update changelog 2018-10-01 14:41:30 -03:00
Ronny Pfannschmidt 5d2d64c190
Merge pull request #4057 from jeffreyrack/4051-improve-error-messaging 
Improve error messaging when invalid syntax is passed to the -m option
 2018-10-01 07:16:59 +02:00
Jeffrey Rackauckas 7a6d16c1eb Adding .rst to end of changelog fragment filename. 2018-09-30 18:45:49 -07:00
Jeffrey Rackauckas c2179c3127 Improve error messaging when invalid syntax is passed to the -m option 2018-09-30 18:34:56 -07:00
Bruno Oliveira d8d7f73e1c
Merge pull request #4045 from nicoddemus/root-conftest-warning-workaround-4039 
Do not issue non-top-level conftest warning when --pyargs is used
 2018-09-27 09:26:11 -03:00
Ronny Pfannschmidt 3c23b5b010
Merge pull request #4037 from nicoddemus/deprecate-item-warnings-captured-hook 
Document that item parameter of pytest_warning_captured hook is deprecated
 2018-09-27 13:20:26 +02:00
Bruno Oliveira 783019a8e6
Rename 4040.trivial.rst to 4040.bugfix.rst 2018-09-27 08:08:03 -03:00
Bruno Oliveira d2fc7ca6e0
Merge pull request #4041 from Zac-HD/user-properties-type 
Ensure user_properties is a list
 2018-09-27 08:04:30 -03:00