floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,085 Commits 32 Branches 205 Tags
f1d51ba1f57619e71cdf787ff1507be59a057c73
Commit Graph

1771 Commits

Author SHA1 Message Date
Ran Benita
18d181fa77 Remove dead code in _pytest.assertion.util._diff_text 
The function handles bytes input, however that is never used.
The function has two callers:

1)

```
            if istext(left) and istext(right):
                explanation = _diff_text(left, right, verbose
```

`istext` checks `isinstance(str)`.

2)

```
def _notin_text(term: str, text: str, verbose: int = 0) -> List[str]:
    ...
    diff = _diff_text(correct_text, text, verbose
```

and `_notin_text` is called once:

```
            if istext(left) and istext(right):
                explanation = _notin_text(left, right, verbose
```
 2019-11-03 20:28:43 +02:00
Ran Benita
dc30d78845 Add type annotations to _pytest._io.saferepr 2019-11-03 20:28:43 +02: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
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
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
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
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
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
cdc53da19c Merge pull request #5990 from MarcoGorelli/plurality-matching 
Plurality matching
 2019-10-28 17:03:15 +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
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
a4faac6c94 mark: move pytest_cmdline_main.tryfist into decorator 
Avoids comments for ignored typing.
 2019-10-27 06:01:18 +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
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
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
Anton Lodder
3c7fbe2d8b Document evaluating complex number for infinity 2019-10-25 12:03:03 -04:00
Michael Krebs
1f5b454355 Add log-auto-indent option to control multiline formatting 2019-10-25 11:31:33 -04:00
Daniel Hahler
82753bec50 terminal: report collection errors as "ERROR" in short summary 2019-10-25 07:03:32 +02:00
AnjoMan
ed9fda84d3 Add tolerance to complex numbers 2019-10-24 23:44:13 -04: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
d1bc2601e4 pytester: align prefixes (#6026) 
pytester: align prefixes
 2019-10-24 18:50:29 -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
Bruno Oliveira
432e5550e5 assertrepr_compare: use safeformat with -vv (#5936) 
assertrepr_compare: use safeformat with -vv
 2019-10-23 19:51:40 -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
Ran Benita
7a2d2d8f07 Merge pull request #5847 from bluetech/type-annotations-4 
2/X Fix check_untyped_defs = True mypy errors
 2019-10-23 22:52:23 +03:00
Daniel Hahler
6242777818 Merge pull request #6041 from blueyed/pytester-splitlines 
pytester: runpytest_inprocess: use splitlines()
 2019-10-23 21:42:21 +02:00
Bruno Oliveira
20ee883b5f Show the mnemonic of pytest.ExitCode in RunResult's repr (#6043) 
Show the mnemonic of pytest.ExitCode in RunResult's repr
 2019-10-23 10:46:58 -03:00
Bruno Oliveira
7beb520555 Show the mnemonic of pytest.ExitCode in RunResult's repr 
Fix #4901
 2019-10-23 09:16:02 -03:00
Ran Benita
1cc1ac5183 Remove some type: ignores fixed in typeshed 2019-10-23 14:47:56 +03:00
Bruno Oliveira
ba4b8c869c Review rm_rf handling of FileNotFoundErrors 2019-10-23 08:30:52 -03:00
Ran Benita
1787bffda0 Fix check_untyped_defs errors in capture 2019-10-23 14:20:15 +03:00
Ran Benita
0267b25c66 Fix some check_untyped_defs mypy errors in terminal 2019-10-23 14:20:15 +03:00
Ran Benita
5dca7a2f4f Fix check_untyped_defs errors in cacheprovider 2019-10-23 14:20:15 +03:00
Ran Benita
93c8822f26 Fix check_untyped_defs errors in warnings 2019-10-23 14:20:15 +03:00
Ran Benita
583c2a2f9b Fix check_untyped_defs errors in logging 2019-10-23 14:20:15 +03:00
Ran Benita
1984c10427 Fix check_untyped_defs errors in doctest 
In order to make the LiteralOutputChecker lazy initialization more
amenable to type checking, I changed it to match the scheme already used
in this file to lazy-initialize PytestDoctestRunner.
 2019-10-23 14:20:14 +03:00
Ran Benita
3246d8a6e9 Merge pull request #6048 from bluetech/mypy-0.740 
Update mypy 0.720 -> 0.740
 2019-10-23 12:47:21 +03:00
Daniel Hahler
b30e7bd1de Merge pull request #6045 from blueyed/minor 
minor: typing for ReprFailDoctest
 2019-10-23 11:44:37 +02:00
Daniel Hahler
db9e248b2e Merge pull request #6039 from blueyed/test_doctest_id 
doctest: unset RUNNER_CLASS in pytest_unconfigure
 2019-10-23 11:38:59 +02:00