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

9439 Commits

Author SHA1 Message Date
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
Ronny Pfannschmidt e253852e4b
Merge pull request #4309 from asottile/less_unicode_hax 
Use unicode/bytes literals instead of calls
 2018-11-05 07:17:13 +01:00
Anthony Sottile a4819844a4 Use unicode/bytes literals instead of calls 2018-11-04 17:43:24 -08:00
Anthony Sottile db996335c8
Merge pull request #4302 from jdufresne/pypi 
Update pypi.python.org reference to pypi.org
 2018-11-04 17:32:56 -08:00
Anthony Sottile 85a3333824 Don't string-compare version numbers 2018-11-04 17:31:48 -08:00
Anthony Sottile 4bf6a07fe2
Merge pull request #4305 from RonnyPfannschmidt/cleanup-tobytes 
replace byte/unicode helpers in test_capture with python level syntax
 2018-11-04 17:29:41 -08:00
Fabien ZARIFIAN db70c75807
Create 4304.bugfix.rst 2018-11-05 00:36:25 +01:00
Fabien ZARIFIAN 1793ac38a9
Update __init__.py 2018-11-05 00:21:12 +01:00
Bruno Oliveira 4aa3c4fa2b
Merge pull request #4303 from blueyed/fix-changelog 
doc: add lost changelog entry
 2018-11-04 20:21:06 -03:00
Fabien ZARIFIAN a447dc86fb
Add test to branch 2018-11-05 00:14:35 +01:00
Ronny Pfannschmidt 7cb271b46f replace byte/unicode helpers in test_capture with python level syntax 2018-11-04 22:01:01 +01:00
Fabien ZARIFIAN c55ca155e9
Update __init__.py 
#4304
 2018-11-04 21:55:56 +01:00
Ronny Pfannschmidt 5eb4016110
Merge pull request #4301 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-11-04 20:23:33 +01:00
Daniel Hahler 34152445cf doc: add lost changelog entry 
Closes https://github.com/pytest-dev/pytest/issues/4300.

[ci skip]
 2018-11-04 18:26:09 +01:00
Jon Dufresne 5e0441d96e Update pypi.python.org reference to pypi.org 2018-11-04 09:02:54 -08:00
Bruno Oliveira d1c9c54571
Merge pull request #4297 from nicoddemus/release-3.10.0 
Release 3.10.0
 2018-11-04 12:25:30 -03:00
Bruno Oliveira bb2ed2f898
Merge pull request #4298 from blueyed/howto 
doc: fix HOWTORELEASE.rst
 2018-11-03 20:32:54 -03:00
Bruno Oliveira 3d88d1827b Fixed linting 2018-11-03 19:50:19 -03:00
Daniel Hahler 7b5f3fe83a doc: fix HOWTORELEASE.rst 
Remove last step, because it was merged already before (changed in
77cad3c4).

[ci skip]
 2018-11-03 21:26:08 +01:00
Daniel Hahler f2b9bbdd4a
Merge pull request #4287 from blueyed/pdb-unconfigure-twice 
debugging: make pytest_configure re-entrant
 2018-11-03 21:09:13 +01:00
Bruno Oliveira c2e906ec97 Preparing release version 3.10.0 2018-11-03 13:51:39 +00:00
Bruno Oliveira 1ec6805112 Fix escape in code sample 2018-11-03 13:48:10 +00:00
Bruno Oliveira 6befdf8b46 Merge remote-tracking branch 'upstream/master' into release-3.10.0 2018-11-03 13:42:20 +00:00
Bruno Oliveira 4cb838d978
Merge pull request #4237 from boxed/master 
Performance fixes
 2018-11-03 10:39:29 -03:00
Daniel Hahler e61e81a7b5 Make debugging's pytest_configure re-entrant 
This is relevant when using runpytest in-process.

Fixes:

E             def test_1(testdir):
E                 testdir.runpytest()
E         >       __import__('pdb').set_trace()
E
E         ../../test_trace_after_runpytest.py:3:
E         …/Vcs/pytest/src/_pytest/debugging.py:81: in set_trace
E             tw = _pytest.config.create_terminal_writer(cls._config)
E
E         config = None, args = (), kwargs = {}, tw = <py._io.terminalwriter.TerminalWriter object at 0x7f1097088160>
E
E             def create_terminal_writer(config, *args, **kwargs):
E                 """Create a TerminalWriter instance configured according to the options
E                 in the config object. Every code which requires a TerminalWriter object
E                 and has access to a config object should use this function.
E                 """
E                 tw = py.io.TerminalWriter(*args, **kwargs)
E         >       if config.option.color == "yes":
E         E       AttributeError: 'NoneType' object has no attribute 'option'
 2018-11-02 18:25:01 +01: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