floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,097 Commits 32 Branches 205 Tags 46 MiB
Commit Graph

61 Commits

Author SHA1 Message Date
Daniel Hahler 649d23c8a8 pytest_sessionfinish: preset exitstatus with UsageErrors 
Previously it would be 0.  Setting it to the expected outcome
(EXIT_USAGEERROR) here already helps `pytest_sessionfinish` hooks.
 2019-04-18 23:18:59 +02:00
Daniel Hahler cc90bcce4c wrap_session: restore old behavior for initstate=1 2019-04-03 05:09:21 +02:00
Daniel Hahler 4148663706
Merge pull request #4979 from blueyed/minor 
Minor: whitespace, typo, docs
 2019-03-26 10:01:13 +01:00
Daniel Hahler aa0b657e58 Add Session.__repr__ 2019-03-24 11:02:58 +01:00
Daniel Hahler 5c26ba9cb1 minor: wrap_session: s/Spurious/unexpected/ 2019-03-22 13:23:44 +01:00
Daniel Hahler 553951c443 Fix some issues related to "-p no:X" with default_plugins 2019-03-21 17:01:50 +01:00
Daniel Hahler 0d31e852b1 Run isort 2019-03-01 14:24:18 +01:00
Bruno Oliveira 0395996756 Merge remote-tracking branch 'upstream/master' into release-4.3.0 2019-02-16 14:06:51 +00:00
Daniel Hahler 407d4a0cf0 collect: python: fix `AssertionError` with broken symlinks 
Fixes https://github.com/pytest-dev/pytest/issues/4782.
 2019-02-14 00:18:14 +01:00
Daniel Hahler 7b91952645 Merge master into features 
Conflicts:
	tox.ini
 2019-02-13 17:58:16 +01:00
Daniel Hahler 61b9246afe Fix/improve handling of pkg init and test file via args 
Ref: https://github.com/pytest-dev/pytest/issues/4344#issuecomment-441095934
 2019-02-11 15:04:24 +01:00
Daniel Hahler fc8800c71f
Merge pull request #4722 from fetzerch/ignore_wildcards 
Add ability to use globs when using --ignore
 2019-02-09 00:11:04 +01:00
Daniel Hahler b4b2f58eab
Merge pull request #4747 from blueyed/visit-filter 
pytest.main: collect: factor out _visit_filter
 2019-02-08 22:19:38 +01:00
Daniel Hahler 7bb504b807 pytest.main: collect: factor out _visit_filter 2019-02-08 19:28:12 +01:00
Daniel Hahler 913a2da6e5 Fix handling of collect_ignore from parent conftest 
`_collectfile` should be called on files only.

Fixes https://github.com/pytest-dev/pytest/issues/4592.
 2019-02-08 18:46:43 +01:00
Christian Fetzer 2dc2a19db5 Add ability to exclude files matching glob patterns in conftest.py 
This adds the `collect_ignore_glob` option for `conftest.py` to allow
Unix-style wildcards for excluding files.
 2019-02-06 16:49:43 +01:00
Christian Fetzer fc5d4654e5 Add ability to exclude files matching glob patterns with --ignore-glob 
This adds the `--ignore-glob` option to allow Unix-style wildcards so
that `--ignore-glob=integration*` excludes all tests that reside in
files starting with `integration`.

Fixes: #3711
 2019-02-06 11:29:30 +01:00
Daniel Hahler fc4aa27cae Derive outcomes.exit.Exception from SystemExit instead of KeyboardInterrupt 
This is required for properly getting out of pdb, where
KeyboardInterrupt is caught in py36 at least.

Ref: https://github.com/pytest-dev/pytest/issues/1865#issuecomment-242599949
 2018-12-11 04:22:33 +01:00
Anthony Sottile b88c3f8f82 Deprecate pytest.config 2018-12-03 09:01:42 -08:00
Ronny Pfannschmidt 88bf01a31e fix #4386 - restructure construction and partial state of ExceptionInfo 2018-11-22 21:20:32 +01:00
Bruno Oliveira 557cb6cffe Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-13 09:01:37 -02:00
Bruno Oliveira b6f16abfe0
Merge pull request #4369 from blueyed/cleanup 
Cleanup/follow-up to #4319
 2018-11-11 11:38:06 -02:00
Daniel Hahler a6ff5e6bfc Cleanup/follow-up to #4319 2018-11-11 01:38:34 +01:00
Daniel Hahler be15ad8d25 Fix collection of direct symlinked files not in python_files 
Fixes https://github.com/pytest-dev/pytest/issues/4325.
 2018-11-11 01:37:06 +01:00
Daniel Hahler 1b260a844f Merge branch 'master' into features 2018-11-09 12:49:55 +01:00
Daniel Hahler c1bde8e0a2 minor: check bool before function call 2018-11-09 01:37:51 +01:00
Daniel Hahler 560c055b09 Session._collect: use reversed parts 2018-11-09 01:36:20 +01:00
Daniel Hahler 9d838fa861 Merge branch 'master' into features 
Conflicts:
	src/_pytest/main.py
 2018-11-08 02:48:59 +01:00
Daniel Hahler 827573c049 cleanup, TODO: use _node_cache 2018-11-07 20:14:07 +01:00
Daniel Hahler 6fce1f0ac7 pkg_roots per session 2018-11-07 20:06:35 +01:00
Daniel Hahler bbb9d72c13 remove paths/parts 2018-11-07 19:36:19 +01:00
Daniel Hahler f8b944dee0 pkg_roots 2018-11-07 19:35:25 +01:00
Daniel Hahler 134b103605 XXX: revert _collect_seen_pkgdirs 2018-11-07 11:01:39 +01:00
Daniel Hahler fa35f650b5 Fix handling of duplicate args with regard to Python packages 
Fixes https://github.com/pytest-dev/pytest/issues/4310.
 2018-11-07 10:06:09 +01:00
Ronny Pfannschmidt f521f5e012 move the _bestrelpathcache to session 2018-11-05 21:07:21 +01:00
Bruno Oliveira 6befdf8b46 Merge remote-tracking branch 'upstream/master' into release-3.10.0 2018-11-03 13:42:20 +00:00
Daniel Hahler 023e1c78df paths: use set and isdisjoint 
Time: 5.36s => 4.85s (before rebase: 4.45s => 3.55s)
 2018-11-02 17:43:04 +01:00
Daniel Hahler 6ffa347c77 Handle dirs only once 
Time: 5.73s/5.88s => 5.36s

(Before rebase: 4.86s => 4.45s)
 2018-11-02 17:43:04 +01:00
Anders Hovmöller 2b50911c9d Minor refactor for readability 
Time: 5.73s => 5.88s/5.82s
 2018-11-02 17:42:53 +01:00
Anders Hovmöller a41820fbf0 collection: performance: use optimized parts function 
Time: 8.53s => 5.73s
 2018-11-02 17:42:53 +01:00
Mick Koch 5ac4eff09b Fix __init__.py as argument also including other package files 2018-11-01 13:10:52 -04:00
Daniel Hahler d65f300988 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-11-01 13:06:36 -04:00
Daniel Hahler 40228fce5a collection: _recurse: skip __pycache__ 2018-10-30 02:34:32 +01: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
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
Anthony Sottile 2368fbb63c Apply reorder-python-imports to all files 2018-10-25 00:01:29 -07:00
Bruno Oliveira 9646a1cd7a Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-15 12:55:28 -03:00
Jose Carlos Menezes 76fb9970c8 Check if returncode is not None before assigning test return code 2018-10-14 18:43:48 -03:00
Jose Carlos Menezes 836c9f82f1 Set test session exitstatus value from Exit excetion return code 2018-10-14 16:39:43 -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