floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,624 Commits 32 Branches 205 Tags
2b99bfbc60a0f344e6ef2c73e2dc5a8b0d9d764f
Commit Graph

2086 Commits

Author SHA1 Message Date
Ronny Pfannschmidt
ae2fc27799 handle test folder cleanup being unable to create a cleanup lock 2018-10-26 14:31:54 +02:00
Bruno Oliveira
8d0e1a99e4 Merge pull request #4241 from blueyed/move-duplicates 
Move handling of duplicate files
 2018-10-26 08:07:48 -03: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
Daniel Hahler
e041823643 Move handling of duplicate files 
This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802.

Adjusts test:

- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743.
 2018-10-25 20:48:08 +02:00
Daniel Hahler
63691f5656 _getconftestmodules: avoid isfile()/dirpath() 
Ref: https://github.com/pytest-dev/pytest/issues/2206#issuecomment-432623646
 2018-10-25 20:25:07 +02:00
Daniel Hahler
0dc6cb298e Move lru_cache wrapper to compat 
Ref: https://github.com/pytest-dev/pytest/pull/4227#discussion_r228060373
 2018-10-25 18:20:36 +02: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
Anthony Sottile
2368fbb63c Apply reorder-python-imports to all files 2018-10-25 00:01:29 -07:00
Ronny Pfannschmidt
f6dfca7182 Merge pull request #4229 from nicoddemus/fix-warning-location 
Show node that originated a warning in the warnings summary
 2018-10-25 08:26:01 +02:00
Ronny Pfannschmidt
65b97c2f41 Merge pull request #4227 from blueyed/_getconftest_pathlist-lru 
Use functools.lru_cache with _getconftest_pathlist
 2018-10-25 08:12:51 +02:00
Bruno Oliveira
1786ad16a7 functools.lru_cache does not exist on Python 2, apply for Python 3 only 2018-10-24 18:59:54 -03:00
Daniel Hahler
2cf4c67e45 doc: fix caplog: s/methods/properties/ 2018-10-24 23:57:11 +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
Daniel Hahler
57caa4e25e Fix flake8: os imported, but unused 
Likely due to b6fa4e24.
 2018-10-24 23:43:41 +02: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
d40cd3ec6b Use functools.lru_cache with _getconftest_pathlist 
For pytest's own suite the `cache_info()` looks as follows:

    > session.config._getconftest_pathlist.cache_info()
    CacheInfo(hits=231, misses=19, maxsize=None, currsize=19)

While it does not really make a difference for me this might help with
larger test suites / the case mentioned in
https://github.com/pytest-dev/pytest/issues/2206#issuecomment-432623646.
 2018-10-24 18:22:30 +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
Daniel Hahler
b51ee48f78 minor: remove unused _shutil_rmtree_remove_writable 2018-10-23 17:36:22 +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
Anthony Sottile
cb39bd0651 Fixes for flake8 master 2018-10-22 08:50:00 -07: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
Ankit Goel
1b51497936 [WIP] Update warning stacklevel when wrapping warnings.warn 2018-10-18 02:36:41 +00:00
Sven-Hendrik Haase
f694d8d6ad Make --color more colorful 2018-10-18 03:56:58 +02:00
David Szotten
e478f66d8b cache is set by the cacheprovider 2018-10-17 21:17:54 +01:00
Ronny Pfannschmidt
cc335d44a0 fix #4179 - bring back the current testrun symlink 2018-10-17 20:43:27 +02:00
Anthony Sottile
ab8907f6f5 s/comparision/comparison/g [ci skip] 2018-10-16 17:23:29 -07:00
Bruno Oliveira
ee0a306ee4 Merge remote-tracking branch 'upstream/features' into merge-features-into-master 2018-10-16 17:41:27 -03: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
f55ded20a9 fix #3533: properly escape raw XML object 
Using string formatting with the raw escaped object lead to string evaluation
"<py._xmlgen.raw object>"
Format the unescaped string first, then use the XML escape method as a last step.
 2018-10-16 14:46:39 +02:00
David Szotten
d67d189d00 grammar 2018-10-15 20:04:39 +01:00
David Szotten
e773c8ceda linting 2018-10-15 20:04:39 +01:00
David Szotten
63c01d1541 update for builtin plugin 2018-10-15 20:04:39 +01:00
David Szotten
c56d7ac40e move files into the pytest file structure 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