Commit Graph

9217 Commits

Author SHA1 Message Date
Daniel Hahler b1312147e0
Merge pull request #4358 from blueyed/instance
Node: do not add "::()" to nodeid
2018-11-11 00:42:57 +01:00
Daniel Hahler 7ab3d818f0
Merge pull request #4356 from blueyed/fix-equal_with_bash
tests: fix equal_with_bash to handle appearing .coverage files
2018-11-11 00:42:23 +01:00
Daniel Hahler f551cb9677 Skip Instances with --collect-only 2018-11-10 23:48:02 +01:00
Daniel Hahler 87254ca593 Add test for --deselect without "::()"
Closes: https://github.com/pytest-dev/pytest/issues/4127.
2018-11-10 23:46:41 +01:00
Daniel Hahler ac8b9c6e9d Node: do not add "::()" to nodeid
Fixes https://github.com/pytest-dev/pytest/issues/4127.
2018-11-10 23:46:41 +01:00
Daniel Hahler b51c1c3b8d tests: fix equal_with_bash for .coverage files
Fixes https://github.com/pytest-dev/pytest/issues/4162.
2018-11-10 03:24:02 +01:00
Daniel Hahler e14ca19988
Merge pull request #4352 from blueyed/_check_initialpaths_for_relpath
Fix nodes._check_initialpaths_for_relpath for dirs
2018-11-10 03:18:36 +01:00
Ronny Pfannschmidt 10d27f412b
Merge pull request #4360 from blueyed/merge-master
Merge master into features
2018-11-09 17:26:40 +01:00
Daniel Hahler bee72a6622 Fix nodes._check_initialpaths_for_relpath for dirs
Ref: https://github.com/pytest-dev/pytest/issues/4321#issuecomment-436951894

Hardens some of the not many tests affected by this:

1. `testing/test_session.py::test_rootdir_option_arg` displayed:

> root/test_rootdir_option_arg2/test_rootdir_option_arg.py

2. `test_cmdline_python_namespace_package` displayed "hello/" prefix for:

> hello/test_hello.py::test_hello
> hello/test_hello.py::test_other
2018-11-09 13:16:59 +01:00
Daniel Hahler 1b260a844f Merge branch 'master' into features 2018-11-09 12:49:55 +01:00
Bruno Oliveira e00f3a2fb7
Merge pull request #4353 from blueyed/test_fileimport
tests: test_fileimport: improve reporting on failure
2018-11-09 08:32:49 -02:00
Daniel Hahler b92530de78
Merge pull request #4271 from blueyed/pytest_cache
cache_dir: use $TOX_ENV_DIR/ prefix if set
2018-11-09 09:09:45 +01:00
Daniel Hahler afaad2f82b
Merge pull request #4354 from blueyed/minor
A set of minor changes from my Git stashes
2018-11-09 08:25:17 +01:00
Daniel Hahler a507f44465 cache_dir: use $TOX_ENV_DIR/ prefix if set
Fixes https://github.com/pytest-dev/pytest/issues/4270
2018-11-09 05:29:28 +01:00
Daniel Hahler d4fdf793b5
Merge pull request #4350 from blueyed/fix-macos-py37
Travis: fix MacOS py37 build
2018-11-09 02:05:47 +01:00
Daniel Hahler feccf532d2 doc: improve runpytest_subprocess 2018-11-09 02:03:44 +01:00
Daniel Hahler 859b322773 doc: improve/simplify doc for breakpoint behavior 2018-11-09 02:03:44 +01:00
Daniel Hahler 4a74d455de minor: typos 2018-11-09 02:03:44 +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 a0890f98d8 tests: harden test_config_error 2018-11-09 01:31:53 +01:00
Daniel Hahler 401a3cd1bc minor: improve FixtureDef.__repr__
Ref: https://github.com/pytest-dev/pytest/pull/4105#pullrequestreview-163486766
2018-11-09 01:27:18 +01:00
Daniel Hahler b494d3d1c1 tests: test_fileimport: improve reporting on failure 2018-11-09 01:17:36 +01:00
Daniel Hahler 6c06057242
Merge pull request #4336 from blueyed/cwd2
Fix/improve handling of chdir with no-args and testpaths
2018-11-09 00:38:34 +01:00
Daniel Hahler bb8a8495ff Revert "Attempt to fix macosx build setup"
This reverts commit 28dbffdaf2.

Appears to be not necessary anymore:
https://travis-ci.org/pytest-dev/pytest/jobs/452598885#L906

[skip appveyor]
2018-11-09 00:33:52 +01:00
Bruno Oliveira 423e19909e
Merge pull request #4307 from fzarifian/fzarifian-pr4304
#4304 the stepwise plugin must be blocked on cacheprovider plugin block request
2018-11-08 20:42:04 -02:00
Daniel Hahler f06fe43649
Merge pull request #4330 from blueyed/fix-report-last-write
Fix TypeError in report_collect with _collect_report_last_write
2018-11-08 21:06:17 +01:00
Daniel Hahler 3137c89cf1 Fix/improve handling of chdir with no-args and testpaths
Fixes https://github.com/pytest-dev/pytest/issues/4332.
2018-11-08 17:50:45 +01:00
Daniel Hahler 5dd509c963
Merge pull request #4338 from blueyed/merge-master
Merge master into features
2018-11-08 17:45:05 +01:00
Fabien ZARIFIAN f48a26f59c
Update AUTHORS 2018-11-08 08:12:08 +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 91404db284 Fix TypeError in report_collect with _collect_report_last_write
`_collect_report_last_write` might be None, when `pytest_collection` was
not called before.  Not sure if this indicates another problem, but it
can be reproduced with `testing/test_collection.py::TestCollector::()::test_getcustomfile_roundtrip`.

Fixes https://github.com/pytest-dev/pytest/issues/4329
2018-11-07 23:42:02 +01:00
Daniel Hahler 4c00552192
Merge pull request #4317 from blueyed/cwd
Handle os.chdir() during collection
2018-11-07 22:49:47 +01:00
Ronny Pfannschmidt 64762d2cfc
Merge pull request #4319 from blueyed/harden-test_collect_init_tests
Fix handling of duplicate args with regard to Python packages
2018-11-07 21:48:54 +01:00
Bruno Oliveira 17b8e2d45b Fix linting 2018-11-07 18:32:23 -02:00
Bruno Oliveira 9a884f1ccb
Improve changelog a bit 2018-11-07 18:30:13 -02: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 f840521854 harden test_collect_init_tests 2018-11-07 19:29:55 +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
Daniel Hahler cb57159e01 Handle os.chdir() during collection 2018-11-05 23:18:47 +01:00
Bruno Oliveira 1752c7e710
Merge pull request #4314 from RonnyPfannschmidt/bestrelpath-cache-move-to-session
move Bestrelpath cache move to session
2018-11-05 17:51:49 -03:00
Anthony Sottile 176d27440c
Merge pull request #4308 from asottile/compare_versions_with_loose_version
Don't string-compare version numbers
2018-11-05 12:42:26 -08:00
Bruno Oliveira 832b59b316
Merge pull request #4312 from Lothiraldan/patch-1
Add missing `-` in front of the new option `--sw`
2018-11-05 17:17:15 -03:00
Ronny Pfannschmidt f521f5e012 move the _bestrelpathcache to session 2018-11-05 21:07:21 +01:00
Boris Feld d42c490bc1
Add missing `-` in front of the new option `--sw` 2018-11-05 15:39:35 +01:00
Fabien ZARIFIAN 5f61f0d2cb
Update __init__.py
As mentionned by @RonnyPfannschmidt, use set_blocked on module stepwise (and it's brother pytest_stepwise like consider_pluginarg method does)
2018-11-05 10:51:15 +01:00