p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,789 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

9789 Commits

Author SHA1 Message Date
Daniel Hahler d0f3f26fff test_collect_capturing: cover captured stderr 2019-03-23 23:17:07 +01:00
Bruno Oliveira b3319a6074
Merge pull request #4944 from henrykironde/k-EXPRESSION 
Add example for k flag
 2019-03-21 19:33:53 -03:00
Bruno Oliveira c9628c52d6
Merge pull request #4971 from bskinn/patch-1 
Fix pytestmark syntax in reference.rst
 2019-03-21 18:59:25 -03: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 77643122a8
Merge pull request #4963 from blueyed/twisted 
ci: rename "trial" tox factor to "twisted"
 2019-03-20 21:58:48 +01:00
Daniel Hahler 543779fc43 tox: generic twisted factor 2019-03-20 18:41:48 +01:00
Daniel Hahler 2ade3d5c89 ci: rename "trial" tox factor to "twisted" 
Ref: https://github.com/pytest-dev/pytest/pull/4848#issuecomment-467909204
 2019-03-20 18:38:50 +01:00
Daniel Hahler 714f2113bb
Merge pull request #4929 from blueyed/fix-_factorytraceback-offset 
Fix line offsets with `ScopeMismatch` errors
 2019-03-20 01:30:58 +01:00
Bruno Oliveira b696666f5a
Merge pull request #4945 from blueyed/FDCapture-repr-None-targetfd_save 
capture: fix FDCapture.__repr__ without targetfd_save
 2019-03-18 13:09:30 -03:00
Bruno Oliveira f4f6cb7532
Merge pull request #4946 from blueyed/fix-bench 
Fix bench/bench.py without args
 2019-03-18 13:04:12 -03:00
henrykironde 1e3d5a0412 Add example for k flag 
Includes an example of multiple expressions
 2019-03-17 22:33:16 -04:00
Daniel Hahler 98981276a0 capture: fix FDCapture.__repr__ without targetfd_save 2019-03-18 02:33:03 +01:00
Daniel Hahler 8c96b65082 Fix bench/bench.py without args 
Fixes:

>   File "…/Vcs/pytest/src/_pytest/config/__init__.py", line 60, in main
>     config = _prepareconfig(args, plugins)
>   File "…/Vcs/pytest/src/_pytest/config/__init__.py", line 179, in _prepareconfig
>     raise TypeError(msg.format(args, type(args)))
> TypeError: `args` parameter expected to be a list or tuple of strings, got: 'empty.py' (type: <class 'str'>)
 2019-03-18 02:28:41 +01:00
Bruno Oliveira c926999cfb
Merge pull request #4939 from smheidrich/mark_xfail_language 
Minor grammar fixes in pytest.mark.xfail docs
 2019-03-17 11:33:20 -03:00
smheidrich 519157cfcf Minor grammar fixes in pytest.mark.xfail docs 2019-03-17 10:14:40 +01:00
Bruno Oliveira b3eb5d1eb7
Merge pull request #4932 from hroncok/sphinx2 
Pin sphinx-removed-in to >= 0.2.0 to support Sphinx 2.0
 2019-03-15 08:18:41 -03: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 d441fa66fe Fix line offsets with `ScopeMismatch` errors 
Fixes https://github.com/pytest-dev/pytest/issues/4928.
 2019-03-15 02:47:33 +01:00
Daniel Hahler 158432217c
Merge pull request #4924 from blueyed/fix-pdbpp 
Fix/harden some pdb tests
 2019-03-15 00:51:12 +01:00
Daniel Hahler bdac9d3dd0 tests: improve test_pdb_interaction_doctest 
- ignore pdbrc (might be done in general, but this was the only affected
  test)
- fail faster in case of unexpected failure
 2019-03-14 19:16:34 +01:00
Daniel Hahler 37158f5303 tests: fix test_pdb_interaction_continue_recursive with pdbpp 2019-03-14 19:16:34 +01:00
Bruno Oliveira 612c3784e5
Merge pull request #4881 from blueyed/travis-cache 
ci: Travis: disable cache by default, only for pre-commit
 2019-03-14 12:39:47 -03:00
Bruno Oliveira 36f774a8fb
Merge pull request #4922 from hroncok/add_object_type 
Remove deprecated Sphinx directive add_description_unit()
 2019-03-14 12:31:34 -03:00
Bruno Oliveira a2b921f890
Merge pull request #4921 from nicoddemus/mtime-test-for-4903 
Add test for mtime issue in #4903
 2019-03-14 10:56:08 -03:00
Bruno Oliveira bd70f5c148 Add test for mtime issue in #4903 2019-03-14 10:16:08 -03: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
Bruno Oliveira 74416525d2
Merge pull request #4903 from bmwiedemann/y2038 
Allow tests to pass after 2038
 2019-03-13 20:07:25 -03:00
Bruno Oliveira 44cb51010c Improve CHANGELOG and code comment 2019-03-13 18:52:30 -03:00
Bruno Oliveira 7fb5ad82d9
Merge pull request #4916 from blueyed/pin-shinx 
docs: pin Sphinx to <2.0
 2019-03-12 22:55:24 -03: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
Daniel Hahler 6630d96253
Merge pull request #4914 from hroncok/issue4913 
Fix pytest tests invocation with custom PYTHONPATH
 2019-03-12 18:58:54 +01:00
Miro Hrončok d32ab6029f Fix pytest tests invocation with custom PYTHONPATH 
Fixes https://github.com/pytest-dev/pytest/issues/4913

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2019-03-12 17:31:42 +01:00
Bruno Oliveira 76c00d1c09
Merge pull request #4909 from nicoddemus/release-4.3.1 
Prepare release 4.3.1
 2019-03-12 13:23:32 -03:00
Bruno Oliveira 492cc4219c Prepare release 4.3.1 2019-03-11 12:59:54 -03:00
Bruno Oliveira 51bf7c3aef
Merge pull request #4897 from altendky/4896-altendky-add_missing_hooks_to_docs 
Add missing plugin hooks to docs
 2019-03-11 12:08:56 -03:00
Bernhard M. Wiedemann 489c61a22d Allow tests to pass after 2038 
without this change, the python-apache-libcloud tests failed
in the year 2039 with

     fp.write(struct.pack("<ll", mtime, size))
 E   error: 'l' format requires -2147483648 <= number <= 2147483647
 2019-03-10 05:22:21 +01:00
Bruno Oliveira 0f3d630634
Merge pull request #4898 from shoyer/patch-1 
Fix broken error message in pytester
 2019-03-08 22:53:01 -03:00
Bruno Oliveira a0f652c559
Rename 4898.trivial.rst to 4898.bugfix.rst 2019-03-08 22:41:57 -03:00
Bruno Oliveira 877b57ae9b
Add CHANGELOG entry 2019-03-08 22:33:07 -03:00
Stephan Hoyer dc7ae41f33
Fix broken error message in pytester 2019-03-08 09:22:00 -08:00
Kyle Altendorf 2d43f42769 Add missing plugin hooks to docs 
pytest-dev/pytest#4896
 2019-03-08 09:24:01 -05:00
Bruno Oliveira 03ef546706
Merge pull request #4893 from nicoddemus/simplify-obj-property 
Simplify 'obj' property definition in PyobjMixin
 2019-03-08 02:04:28 -03:00
Daniel Hahler de5aa3847e
Apply suggestions from code review 
Co-Authored-By: nicoddemus <nicoddemus@gmail.com>
 2019-03-07 12:53:47 -03:00
Bruno Oliveira 0f4905a259 Simplify 'obj' property definition in PyobjMixin 
This uses modern property definition syntax, declaring both getter
and setter as obj() functions
 2019-03-07 08:15:04 -03:00
Daniel Hahler a70c1ca100 ci: Travis: disable cache by default, only for pre-commit 
For pip the usual http caching should be good enough.
This keeps the cache for pre-commit with the linting env for now.

Ref: https://github.com/pytest-dev/pytest/issues/3502
 2019-03-05 23:12:11 +01:00
Daniel Hahler 236bada755
Merge pull request #4768 from horta/avoid-pkg_resources 
Avoid pkg_resources import at the top-level.
 2019-03-05 23:02:02 +01:00
Daniel Hahler 2b3d69da2b
Merge pull request #4865 from blueyed/revisit-cov-new 
ci: revisit coverage reporting
 2019-03-05 19:05:36 +01:00
Daniel Hahler 8481e438bd ci: revisit coverage reporting 
This brings coverage back that got missing with 9dcd6f2.

Continuation of #4839 / #4846.
 2019-03-05 13:34:46 +01:00
Daniel Hahler bd2c9bedcf
Merge pull request #4885 from blueyed/fix-master 
Fix master: ci: Azure: remove pypy3
 2019-03-04 19:32:38 +01:00
Daniel Hahler 2fe922608f
Merge pull request #4883 from blueyed/fix-coverage-includes 
.coveragerc: fix include for pypy
 2019-03-04 19:31:14 +01:00