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

1543 Commits

Author SHA1 Message Date
Bruno Oliveira 9f66102869 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-05-04 10:47:57 -03:00
Don Kirkby 254b195f50
Fix a typo 2019-05-03 22:30:20 -07:00
Bruno Oliveira af40473c9a Add quick note about accessing config through session or item objects 
Fix #5030
 2019-05-01 11:46:35 -03:00
Bruno Oliveira 204004c8b8
Review doctest docs (#5183) 
Review doctest docs
 2019-04-29 08:02:59 -03:00
Bruno Oliveira 772a4a5cf3
Remove all version references to obsolete pytest versions (#5184) 
Remove all version references to obsolete pytest versions
 2019-04-29 08:02:32 -03:00
Bruno Oliveira e943aff995 Update blurb about Sybil 2019-04-28 20:01:22 -03:00
Bruno Oliveira 9c5da9c0d1 Remove all version references to obsolete pytest versions 
Remove version references to pytest 2 and 3.

Just like Python 3 no longer has references to Python 2, I think
we should follow the same approach in pytest.
 2019-04-28 12:37:58 -03:00
Bruno Oliveira f6ab6d71ad Run regendoc 2019-04-28 12:17:15 -03:00
Bruno Oliveira 67755d67fb Review doctest docs 
* Add pytest.skip() example
* Add blurb about Sybil
* Create a subsection for doctest-options
* Create a subsection for pytest-specific features
 2019-04-28 12:17:15 -03:00
Bruno Oliveira 53cd7fd2ea Introduce new warning subclasses 
Fix #5177
 2019-04-28 10:38:25 -03:00
Bruno Oliveira 8532e991a5 Publish UnknownMarkWarning as part of the public API and docs 2019-04-28 10:16:07 -03:00
Bruno Oliveira 50937fe622 Add note about pytest_load_initial_conftests working only from plugins 
Fix #5175
 2019-04-27 10:12:27 -03:00
Daniel Hahler 7f519f8ab7 Merge master into features 2019-04-27 00:43:00 +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
Bruno Oliveira 8d3a5dcd1b Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-04-15 14:47:45 -03:00
Bruno Oliveira 006dc30476 Preparing release version 4.4.1 2019-04-15 14:24:17 +00:00
Daniel Hahler 6f0a5789fb Merge master into features 2019-04-14 23:22:21 +02:00
Anthony Sottile 8449294e5d blacken-docs more code samples in docs 2019-04-12 04:50:26 -07:00
Daniel Hahler 42e60d935a doc/changelog 2019-04-11 11:44:04 +02:00
Daniel Hahler 1f66e3b0d0 docs: tbreportdemo: remove obsolete comment 2019-04-11 11:39:23 +02:00
Daniel Hahler eb5b2e0db5 Support glob argument with ``--cache-show`` 2019-04-04 18:10:39 +02:00
Daniel Hahler 8907fedc79 Merge master into features (with regen branch) 2019-04-03 22:11:00 +02:00
Daniel Hahler befc8a3f10 Update via https://github.com/pytest-dev/regendoc/pull/8 2019-04-03 22:08:44 +02:00
Daniel Hahler 5935fbaa7a doc/en/Makefile: stabilize output between regendoc versions 2019-04-03 22:07:33 +02:00
Daniel Hahler cec2dd6a7c doc/en/Makefile: allow passing in REGENDOC_FILES 
This allows for:

> make -C doc/en regen REGENDOC_FILES=example/parametrize.rst
 2019-04-03 19:53:00 +02:00
Daniel Hahler 266bf2c007 doc: make regen: replace trailing spaces already 2019-04-03 17:34:26 +02:00
Daniel Hahler db34bf01b6 doc: minor whitespace, punctuation 2019-04-03 11:45:45 +02:00
Zac Hatfield-Dodds 9121138a1b Emit warning for unknown marks 2019-04-01 10:40:18 +11:00
Daniel Hahler deade370b9
Update doc/en/mark.rst 
Co-Authored-By: Zac-HD <Zac-HD@users.noreply.github.com>
 2019-04-01 07:13:45 +11:00
Zac-HD bcc08ffe4d More docs on registering marks 2019-03-31 14:22:30 +11:00
Bruno Oliveira 8881b201aa Preparing release version 4.4.0 2019-03-29 20:49:18 +00:00
Bruno Oliveira 3d9e68ecfd Update doc/en/parametrize.rst 2019-03-28 00:07:28 +09:00
ApaDoctor cf6e2ceafd add ini option to disable string escape for parametrization 2019-03-28 00:07:28 +09:00
Bruno Oliveira 69a55d334a
Merge pull request #5004 from blueyed/doc-pdb 
doc: fix note about output capturing with pdb
 2019-03-26 20:20:05 -03:00
Bruno Oliveira 057c97812b
Merge pull request #4975 from blueyed/verbose-fixes 
Fix usages of "verbose" option
 2019-03-26 18:38:39 -03:00
Daniel Hahler 52730f6330 doc: fix note about output capturing with pdb 
[skip travis]
 2019-03-26 18:33:00 +01:00
Daniel Hahler e1ae469504 Merge master into features 2019-03-26 10:23:21 +01:00
Daniel Hahler 23146e7527 Fix usages of "verbose" option 
With `-qq` `bool(config.getoption("verbose"))` is True; it needs to be
checked for `> 0`.
 2019-03-26 10:11:25 +01:00
Daniel Hahler 8e125c9759 doc/en/reference.rst: whitespace/alignment 2019-03-22 13:23:44 +01:00
Brian Skinn dcbdcc729b
Fix pytestmark syntax in reference.rst 
pytest 4.3.1 throws an error if `pytestmark` is set to a tuple of marks; it appears to insist on a list.



With `pytestmark = [pytest.mark.api, pytest.mark.good]`:

```
============================== test session starts ==============================
platform win32 -- Python 3.6.3, pytest-4.3.1, py-1.8.0, pluggy-0.9.0
rootdir: C:\Temp\git\sphobjinv, inifile: tox.ini
plugins: timeout-1.3.3
collected 48 items / 41 deselected / 7 selected

tests\test_api_good.py .......                                             [100%]

==================== 7 passed, 41 deselected in 0.15 seconds ====================
```


With `pytestmark = (pytest.mark.api, pytest.mark.good)`:
```
==================================== ERRORS =====================================
____________________ ERROR collecting tests/test_api_good.py ____________________
env\lib\site-packages\_pytest\runner.py:226: in from_call
    result = func()
env\lib\site-packages\_pytest\runner.py:289: in <lambda>
    call = CallInfo.from_call(lambda: list(collector.collect()), "collect")
env\lib\site-packages\_pytest\python.py:435: in collect
    self._inject_setup_module_fixture()
env\lib\site-packages\_pytest\python.py:447: in _inject_setup_module_fixture
    setup_module = _get_non_fixture_func(self.obj, "setUpModule")
env\lib\site-packages\_pytest\python.py:255: in obj
    self.own_markers.extend(get_unpacked_marks(self.obj))
env\lib\site-packages\_pytest\mark\structures.py:244: in get_unpacked_marks
    return normalize_mark_list(mark_list)
env\lib\site-packages\_pytest\mark\structures.py:259: in normalize_mark_list
    raise TypeError("got {!r} instead of Mark".format(mark))
E   TypeError: got (MarkDecorator(mark=Mark(name='api', args=(), kwargs={})), MarkDecorator(mark=Mark(name='good', args=(), kwargs={}))) instead of Mark
!!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
==================== 19 deselected, 1 error in 0.27 seconds =====================
```
 2019-03-21 15:14:28 -04:00
Daniel Hahler 751c061d9a Merge master into features 2019-03-19 01:07:10 +01:00
smheidrich 519157cfcf Minor grammar fixes in pytest.mark.xfail docs 2019-03-17 10:14:40 +01:00
Miro Hrončok 2af0a023c9 Pin sphinx-removed-in to >= 0.2.0 to support Sphinx 2.0 
Fixes https://github.com/pytest-dev/pytest/issues/4912
 2019-03-15 10:56:13 +01:00
Daniel Hahler 7afe17740f Merge master into features 2019-03-15 00:52:12 +01:00
Miro Hrončok 134b957bf4 Remove deprecated Sphinx directive add_description_unit() 
Partial solution for https://github.com/pytest-dev/pytest/issues/4912
 2019-03-14 12:16:59 +01:00
Daniel Hahler f4bcb44025 docs: pin Sphinx to <2.0 
Ref: https://github.com/pytest-dev/pytest/issues/4912
 2019-03-13 02:36:15 +01:00
Bruno Oliveira 492cc4219c Prepare release 4.3.1 2019-03-11 12:59:54 -03:00
Kyle Altendorf 2d43f42769 Add missing plugin hooks to docs 
pytest-dev/pytest#4896
 2019-03-08 09:24:01 -05:00
Daniel Hahler 76687030f0 Merge branch 'master' into merge-master-into-features 
Conflicts:
	appveyor.yml
	setup.py
 2019-03-05 19:07:36 +01:00
Bruno Oliveira dac164cc99 Add missing ref docs to tmp_path and tmp_path_factory 2019-03-01 17:09:07 -03:00