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

10315 Commits

Author SHA1 Message Date
Daniel Hahler e3e57a755b
Merge pull request #5083 from blueyed/capture-_suspended 
capture: store _state
 2019-04-19 17:32:54 +02:00
Daniel Hahler 79d5fc3a0b
Merge pull request #5144 from blueyed/sessionfinish-exitstatus 
pytest_sessionfinish: preset exitstatus with UsageErrors
 2019-04-19 17:30:01 +02:00
Bruno Oliveira 322d686ab4
Merge pull request #5145 from blueyed/prefer-fast-wrapper 
conftest: use a hookwrapper with sorting faster tests first
 2019-04-19 12:25:55 -03:00
Daniel Hahler f75f7c1925 conftest: use a hookwrapper with sorting faster tests first 2019-04-19 01:23:34 +02:00
Daniel Hahler 698c4e75fd capture: track current state in _state attributes 
This is meant for debugging, and making assertions later.
 2019-04-19 00:35:15 +02:00
Daniel Hahler 4749dca764 changelog [ci skip] 2019-04-18 23:54:20 +02:00
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 e87d3d70e2
Merge pull request #5138 from ikonst/notify_exception_without_terminal 
Fix dependencies on 'terminal' plugin
 2019-04-17 23:20:49 +02:00
Daniel Hahler 1460ad6027
Merge pull request #5111 from blueyed/deselect_by_keyword-skip 
deselect_by_keyword: skip without expression
 2019-04-17 23:20:02 +02:00
Daniel Hahler 78cd1a07d0
Merge pull request #5140 from blueyed/rewrite-name 
assertion rewriting: use actual helper name
 2019-04-17 23:19:38 +02:00
Ilya Konstantinov d67d68f6d3 Eliminate core dependency on 'terminal' plugin 2019-04-17 11:19:19 -07:00
Bruno Oliveira 008d04398a
Merge pull request #5135 from dougthor42/patch-1 
[Docs] Fix typo in skipping.rst
 2019-04-17 14:36:57 -03:00
Daniel Hahler c3178a176d move test 2019-04-17 15:30:34 +02:00
Daniel Hahler df1d1105b0 Merge remote-tracking branch 'origin/features' into short-summary-message 
Conflicts:
	src/_pytest/skipping.py
 2019-04-17 15:30:19 +02:00
Daniel Hahler 2b11b2c093
Merge pull request #5126 from blueyed/report-get_verbose_word 
terminal/reports: use get_verbose_word method
 2019-04-17 14:43:54 +02:00
Daniel Hahler adb8edbae1 assertion rewriting: use actual helper name 
This makes it easier / possible to grep.
 2019-04-17 14:41:34 +02:00
Douglas Thor 0e651d7297
[Docs] Fix typo in skipping.rst 
One of the `pytest.mark.skipif` blocks does not use the `reason` kwarg.
 2019-04-16 09:30:13 -07:00
Anthony Sottile 3cff5e252d
Merge pull request #5117 from blueyed/cov-terminal 
Minor coverage improvements for terminal plugin
 2019-04-15 14:30:18 -07:00
Daniel Hahler 7412df0920 fixup! terminal: summary_errors: replace if with assert 2019-04-15 22:53:31 +02:00
Anthony Sottile 990133f804
Merge pull request #5132 from nicoddemus/merge-master-into-features 
Merge master into features
 2019-04-15 13:11:33 -07:00
Bruno Oliveira df68808d29
Merge pull request #5116 from blueyed/cov-pytester 
Minor coverage improvements for pytester
 2019-04-15 14:49:28 -03:00
Bruno Oliveira b64d9402ca
Merge pull request #5108 from blueyed/summary 
terminal summary: display passes after warnings
 2019-04-15 14:49:01 -03:00
Bruno Oliveira 8d3a5dcd1b Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-04-15 14:47:45 -03:00
Bruno Oliveira 9eac4733c5
Merge pull request #5129 from nicoddemus/release-4.4.1 
Release version 4.4.1
 2019-04-15 14:41:36 -03:00
Bruno Oliveira 24bd51bda0
Merge pull request #5131 from blueyed/_getfailureheadline 
_getfailureheadline: get head_line property only once
 2019-04-15 12:23:41 -03:00
Daniel Hahler 9374114370 terminal/reports: add/use _get_verbose_word method 2019-04-15 17:06:18 +02:00
Daniel Hahler eb13530560 _getfailureheadline: get head_line property only once 2019-04-15 17:04:51 +02:00
Daniel Hahler 5530d3e15d
Merge pull request #5120 from blueyed/minor 
A collection of minor code tweaks
 2019-04-15 16:32:20 +02:00
Daniel Hahler ea79eb5c3f terminal summary: display passes after warnings 
This displays passes (with output, `-rP`) before the short summary, and
before any other output from other plugins also.
 2019-04-15 16:31:42 +02:00
Bruno Oliveira c8b904a406
Merge pull request #5124 from blueyed/terminal-summary_failures 
terminal: revisit summary_failures
 2019-04-15 11:26:52 -03:00
Bruno Oliveira d45fa7b212
Merge pull request #5123 from blueyed/clsname 
TestReport: use class name in repr
 2019-04-15 11:25:42 -03:00
Bruno Oliveira 852ca7ad59
Merge pull request #5114 from blueyed/fixtest 
test_pytest_exit_returncode: ignore ResourceWarnings
 2019-04-15 11:25:16 -03:00
Bruno Oliveira 006dc30476 Preparing release version 4.4.1 2019-04-15 14:24:17 +00:00
Daniel Hahler 45ba736c81
Merge pull request #5128 from blueyed/mark-is 
Fix error message with unregistered markers
 2019-04-15 16:23:54 +02:00
Bruno Oliveira c453fe7053
Merge pull request #5118 from blueyed/mm 
Merge master into features
 2019-04-15 11:21:59 -03:00
Daniel Hahler cc005af47e Fix error message with unregistered markers 2019-04-15 10:15:37 +02:00
Daniel Hahler 20c624efcf terminal: revisit summary_failures 
- get the list of reports for teardown sections only once
- do not check option in loop
 2019-04-15 06:47:51 +02:00
Daniel Hahler b2be6c1a30 TestReport: use class name in repr 2019-04-15 05:47:45 +02:00
Daniel Hahler c43a9c83ee doc: pytest_deselected: not only via keywords 2019-04-14 23:53:06 +02:00
Daniel Hahler e804e419bc remove unnecessary newline 2019-04-14 23:53:06 +02:00
Daniel Hahler 992e7f7771 rename variable 2019-04-14 23:53:06 +02:00
Daniel Hahler bd1a2e6435 fix typo 2019-04-14 23:53:06 +02:00
Daniel Hahler 1d137fd2fe minor: LFPlugin: de-indent code by returning if not active 2019-04-14 23:53:06 +02:00
Daniel Hahler f1f1862b19 Update testing/test_runner.py 2019-04-14 23:26:56 +02:00
Daniel Hahler 6f0a5789fb Merge master into features 2019-04-14 23:22:21 +02:00
Daniel Hahler cc78a533ae terminal: summary_errors: replace if with assert 2019-04-14 23:17:27 +02:00
Daniel Hahler fd0b3e2e8b getreportopt: remove needless if 2019-04-14 23:17:27 +02:00
Daniel Hahler f3dbe5a308 pytester: listoutcomes: assert instead of implicit if 2019-04-14 23:00:38 +02:00
Daniel Hahler 1da8ce65a6 pytester: raise_on_kwargs: ignore branch coverage 2019-04-14 23:00:38 +02:00
Daniel Hahler 1dd5f088fa test_pytest_exit_returncode: ignore ResourceWarnings 
Fixes https://github.com/pytest-dev/pytest/issues/5088.
 2019-04-14 21:55:15 +02:00