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

11292 Commits

Author SHA1 Message Date
MarcoGorelli 9303de877a Fix error in newly introduced test_collecterror 
Via https://github.com/pytest-dev/pytest/pull/6107.

(cherry picked from commit 1b9fbbfa195aa20c48574265935dc5e66b96ec16)
 2019-11-03 18:16:46 +01:00
Daniel Hahler 3fb969897a
Merge pull request #6059 from blueyed/collect-error-short-summary 
terminal: report collection errors as "ERROR" in short summary
 2019-11-02 15:34:12 +01:00
Daniel Hahler 6df4d07a57
Merge pull request #6067 from blueyed/harden-test 
tests: harden test_disabled_capture_fixture
 2019-11-02 15:33:55 +01:00
Bruno Oliveira 0947ecd6f0
Change 5924 and 5936 changelog entries to improvement (#6065) 
Change 5924 and 5936 changelog entries to improvement
 2019-11-02 11:23:06 -03:00
Daniel Hahler 0c7c26fe6e FSCollector: keep/use given fspath 
Via https://github.com/blueyed/pytest/pull/42.
 2019-11-02 10:02:23 +01:00
Florian Bruhin 35800a2f73
Merge pull request #6112 from gaucheph/fix-small-typo 
typos
 2019-11-01 11:18:06 +01:00
Patrick Harmon abc890079f typos 2019-10-31 23:19:35 -05:00
Daniel Hahler dc5a4fbe23
Merge pull request #6099 from davidszotten/trace_parametrize 
Fix --trace for parametrized tests
 2019-11-01 05:06:26 +01:00
David Szotten 285524c6cd Fix --trace for parametrized tests 
Without this, the second time it tries to stop in a parametrized
function it raises instead:

`ValueError: --trace can't be used with a fixture named func!`

Implementation idea, test (and changelog tweaks) thanks to blueyed

Co-Authored-By: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Co-Authored-By: Daniel Hahler <git@thequod.de>
 2019-10-31 21:41:33 +00:00
Daniel Hahler 7f851a215b
Merge pull request #6032 from blueyed/ci-branches 
ci: Travis: configure/restrict branch builds
 2019-10-31 10:38:01 +01:00
Joshua Storck f400804206 Removing pluginmanager as parameter in definition of pytest_addoption hook 2019-10-30 16:25:50 -04:00
Joshua Storck 0027908e9e Removing :py:func: and :ref: from changelog as it's not supported by towncrier 2019-10-30 15:02:18 -04:00
Joshua Storck 7a96d94fd4 Making it possible to access the pluginmanager in the pytest_addoption hook 2019-10-30 14:18:13 -04:00
Bruno Oliveira 3406857284
Introduce --report-log (#5980) 
Introduce --report-log
 2019-10-30 10:24:35 -03:00
Bruno Oliveira 09096f7436 Remove 'experimental' status from report serialization hooks 2019-10-30 09:43:33 -03:00
Bruno Oliveira b99661b9d7 Introduce --report-log option 
Fix #4488
 2019-10-30 09:43:33 -03:00
Daniel Hahler 8c21416798 lsof_check: include exc with skip message 2019-10-29 15:25:15 +01:00
Daniel Hahler 6d2cabae57 terminal: fix line offset with skip reports 
The original fix in https://github.com/pytest-dev/pytest/pull/2548 was
wrong, and was likely meant to fix the use with decorators instead,
which this does now (while reverting 869eed9898).
 2019-10-29 13:11:02 +01:00
Daniel Hahler 0225cb37c0
Merge pull request #6077 from blueyed/ci-remove-single-py37-pexpect 
ci: Travis: include pexpect in main py37 job
 2019-10-28 17:05:31 +01:00
Daniel Hahler cdc53da19c
Merge pull request #5990 from MarcoGorelli/plurality-matching 
Plurality matching
 2019-10-28 17:03:15 +01:00
Daniel Hahler e7898dedf4
Merge pull request #6093 from blueyed/fix-flaky 
tests: fix testing/test_capture.py::test_typeerror_encodedfile_write
 2019-10-28 16:17:46 +01:00
Daniel Hahler 6d33f4cdce
Merge pull request #6076 from blueyed/runpytest_subprocess-slowest 
tests: conftest: handle tests using runpytest_subprocess as "slowest"
 2019-10-28 14:49:54 +01:00
Daniel Hahler 60ceec6eb1 tests: fix testing/test_capture.py::test_typeerror_encodedfile_write 
Failed for me due to different indent (?) - not reproducible:

    >   ???
    E   Failed: nomatch: 'E           TypeError: write() argument must be str, not bytes'
    …
    E       and: '>   def mode(self):'
    E       and: 'E   TypeError: write() argument must be str, not bytes'
    …
    E   remains unmatched: 'E           TypeError: write() argument must be str, not bytes'
 2019-10-28 14:37:26 +01:00
Ran Benita 7f8bf4d9f6
Merge pull request #6066 from bluetech/type-annotations-paths 
Add type annotations to _pytest.pathlib and _pytest.tmpdir
 2019-10-28 15:20:45 +02:00
Daniel Hahler a4554e666a tests: speed up test_faulthandler.test_timeout 2019-10-28 13:44:06 +01:00
Daniel Hahler d6e324a5e6 tests: conftest: handle tests using runpytest_subprocess as "slowest" 2019-10-28 13:43:42 +01:00
Daniel Hahler 023dde89e1 ci: Travis: include pexpect in main py37 job 
This removes xdist there (not compatible with the pexpect tests), but it
is better to have one job less, although slower due to not using xdist.
 2019-10-28 13:39:43 +01:00
Daniel Hahler a5bd19e3b4 tests: lazily import doctest in approx tests 2019-10-28 12:55:16 +01:00
Daniel Hahler 32412532ef tests: mock doctest.DocTestRunner to not use real pdb 
It is not used there anyway, and might cause false positives.
 2019-10-28 12:55:16 +01:00
Daniel Hahler ec27363748
Merge pull request #6025 from blueyed/pytester-typing 
pytester: typing
 2019-10-28 05:31:31 +01:00
Daniel Hahler 716f532a38
Merge pull request #6070 from blueyed/pexpect-freebsd 
pytester: spawn: do not skip FreeBSD
 2019-10-28 05:13:31 +01:00
Daniel Hahler 820b747e7a tests: merge/remove test_dontreadfrominput_buffer_python3 2019-10-27 19:32:06 +01:00
MarcoGorelli d863c30c74 Fix plurality mismatch for and in pytest terminal summary 2019-10-27 15:16:24 +00:00
Daniel Hahler 886a3ad609 pytester: typing 2019-10-27 12:32:14 +01:00
Daniel Hahler cbc39dd86e
Merge pull request #6079 from blueyed/tryfirst 
mark: move pytest_cmdline_main.tryfist into decorator
 2019-10-27 07:21:31 +01:00
Daniel Hahler a4faac6c94 mark: move pytest_cmdline_main.tryfist into decorator 
Avoids comments for ignored typing.
 2019-10-27 06:01:18 +01:00
Daniel Hahler 81c3bc76bc tests: harden test_disabled_capture_fixture 2019-10-27 03:02:24 +01:00
Daniel Hahler a92f49afa7
Merge pull request #6073 from blueyed/merge-master-into-features 
Merge master into features
 2019-10-27 02:57:00 +01:00
Daniel Hahler 7f1af84f47 Merge master into features 
Conflicts:
	src/_pytest/logging.py
 2019-10-27 02:06:36 +01:00
Daniel Hahler 8e8a8fa4b9 pytester: spawn: do not skip FreeBSD 
Fixes https://github.com/pytest-dev/pytest/issues/6069
 2019-10-27 00:44:25 +02:00
Daniel Hahler be514178d0 tox: remove platform restriction, only used for pexpect 
This would prevent TOXENV=py37-pexpect-… from running on e.g. FreeBSD.
And even on Windows it is pytest's job of skipping the tests then.  This
was probably still from when the pexpect env was only running
pexpect-based tests.
 2019-10-27 00:23:25 +02:00
Ran Benita 00a278cdb4 Add type annotations to _pytest.tmpdir 
At least the ones I was able to.
 2019-10-26 20:30:44 +03:00
Ran Benita 59a59f371b Add type annotations to _pytest.pathlib 
At least the ones I was sure of.
 2019-10-26 20:08:36 +03:00
Bruno Oliveira 928587da60 Change 5924 and 5936 changelog entries to improvement [ci skip] 2019-10-26 13:02:47 -03:00
Bruno Oliveira cefe6bfec3
Replace a few outdated references to py.test with pytest (#6063) 
Replace a few outdated references to py.test with pytest
 2019-10-26 12:59:22 -03:00
Bruno Oliveira ac633b8969
Replace py.io.TextIO with io.StringIO (#6064) 
Replace py.io.TextIO with io.StringIO
 2019-10-26 12:58:52 -03:00
Bruno Oliveira 1ad4ca6ac1
Support sys.pycache_prefix on py38 (#5864) 
Support sys.pycache_prefix on py38
 2019-10-26 11:29:09 -03:00
Bruno Oliveira 6f20b4b014 Introduce compat.fspath 2019-10-26 10:37:44 -03:00
Ran Benita 0b8c35516f Replace py.io.TextIO with io.StringIO 
In Python3, py.io.TextIO is just an alias to io.StringIO. Remove the
indirection.
 2019-10-26 16:33:57 +03:00
Ran Benita 96de232791 Replace a few outdated references to py.test with pytest 2019-10-26 16:28:17 +03:00