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

11170 Commits

Author SHA1 Message Date
Daniel Hahler 0c7c26fe6e FSCollector: keep/use given fspath 
Via https://github.com/blueyed/pytest/pull/42.
 2019-11-02 10:02:23 +01: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
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 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 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 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
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 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
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 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
Bruno Oliveira f93f284356 Support sys.pycache_prefix on py38 
Fix #4730
 2019-10-26 10:17:21 -03:00
Kale Kundert b9df9a4761
Merge pull request #6058 from AnjoMan/6057-tolerance-on-complex-approx 
6057 tolerance on complex approx
 2019-10-25 15:31:47 -04:00
Bruno Oliveira 39066d5a42
Merge master into features (#6056) 
Merge master into features
 2019-10-25 16:27:14 -03:00
Anton Lodder 3c7fbe2d8b Document evaluating complex number for infinity 2019-10-25 12:03:03 -04:00
AnjoMan 34a02121ad Drop python 2 unicode tests for approx repr 2019-10-24 23:44:13 -04:00
AnjoMan ed9fda84d3 Add tolerance to complex numbers 2019-10-24 23:44:13 -04:00
Bruno Oliveira 2fc1f7b8dc
Put the 4.6 changelogs together (#5969) 
Put the 4.6 changelogs together
 2019-10-24 21:21:59 -03:00
Bruno Oliveira fb0e8b99d1 Merge remote-tracking branch 'upstream/master' into mm 
Conflicts:
- 	src/_pytest/cacheprovider.py
 2019-10-24 21:13:43 -03:00
Bruno Oliveira dae238c9b1
Release version 5.2.2 (#6055) 
Release version 5.2.2
 2019-10-24 21:09:15 -03:00
Bruno Oliveira b27ba97721 Preparing release version 5.2.2 2019-10-24 19:24:04 -04:00
Bruno Oliveira d1bc2601e4
pytester: align prefixes (#6026) 
pytester: align prefixes
 2019-10-24 18:50:29 -03:00
Bruno Oliveira 2b56c7e1ce
Update Tidelift docs with latest campaign (#6053) 
Update Tidelift docs with latest campaign
 2019-10-24 18:46:21 -03:00
Bruno Oliveira 73a77c90ca
Change #5061 changelog to 'improvement' (#6051) 
Change #5061 changelog to 'improvement'
 2019-10-24 18:44:48 -03:00
Daniel Hahler 8ef4287bf0 pytester: align prefixes 
This is important for using another match_nickname, e.g. "re.match".

TODO:

- [ ] changelog
- [ ] test
 2019-10-24 23:20:12 +02:00
Daniel Hahler 45fc0d9cd8
Merge pull request #6040 from blueyed/test_meta-slow 
tests: mark test_meta as slow
 2019-10-24 22:53:04 +02:00
Bruno Oliveira 2bee7d7c3e Update Tidelift docs with latest campaign 
Tidelift has launched a new marketing campaign as outlined here:

* https://forum.tidelift.com/t/task-enhancement-marketing-the-tidelift-subscription-to-your-users/321

This PR splits the previous "sponsor" information into two, Open Collective
and Tidelift (as they have very different target audiences).

Also took the opportunity to reorder some items at the end of
the contents page in a manner that I believe make more sense.
 2019-10-24 14:58:58 -03:00
Bruno Oliveira 92418b8d5d Change #5061 changelog to 'improvement' 2019-10-23 21:27:07 -03:00
Bruno Oliveira 432e5550e5
assertrepr_compare: use safeformat with -vv (#5936) 
assertrepr_compare: use safeformat with -vv
 2019-10-23 19:51:40 -03:00
Bruno Oliveira 713b9e54c3
Review rm_rf handling of FileNotFoundErrors (#6044) 
Review rm_rf handling of FileNotFoundErrors
 2019-10-23 19:22:26 -03:00
Daniel Hahler 8316d4392a
Merge pull request #6028 from blueyed/DontReadFromInput-msg 
capture: improve message with DontReadFromInput's IOError
 2019-10-23 22:48:15 +02:00