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

1385 Commits

Author SHA1 Message Date
Daniel Hahler 45c4a8fb3d Use atomicrewrites only on Windows 
Fixes https://github.com/pytest-dev/pytest/issues/6147
 2019-11-07 20:57:45 +01:00
Daniel Hahler ab101658f0
saferepr: handle BaseExceptions (#6047) 2019-11-07 12:33:22 +01:00
Daniel Hahler b268463243
Merge master into features (#6111) 2019-11-07 12:31:33 +01:00
Daniel Hahler c4a110b20a Session: collect: keep/use already parsed initialpart 
Via https://github.com/blueyed/pytest/pull/42.
 2019-11-06 22:09:24 +01:00
Daniel Hahler eb7a4e32ad saferepr: handle BaseExceptions 
This causes INTERNALERRORs with pytest-django, which uses
`pytest.fail` (derived from `BaseException`) to prevent DB access, when
pytest then tries to e.g. display the `repr()` for a Django `QuerySet`
etc.

Ref: https://github.com/pytest-dev/pytest-django/pull/776
 2019-11-06 22:08:10 +01:00
Daniel Hahler fe429d4ce8
assert: fix _compare_eq_iterable: re-format both sides (#6137) 2019-11-06 22:06:39 +01:00
Bruno Oliveira 74f4ec5986
Making it possible to access the pluginmanager in the pytest_ad… (#6106) 
Making it possible to access the pluginmanager in the pytest_addoptio…
 2019-11-06 15:18:59 -03:00
Daniel Hahler 4e45472405 Merge master into features 
Conflicts:
	src/_pytest/debugging.py
 2019-11-06 14:22:07 +01:00
Daniel Hahler 01769b141a
Merge pull request #6100 from blueyed/fix-skip-offset 
terminal: fix line offset with skip reports
 2019-11-06 13:29:40 +01:00
Daniel Hahler 9071a2a5e0
Merge pull request #6119 from blueyed/FSCollector-fspath 
FSCollector: keep/use given fspath
 2019-11-06 13:10:27 +01:00
Daniel Hahler ce3d431002 assert: fix _compare_eq_iterable: re-format both sides 
Follow-up to 946434c61 (#5924).

Before this patch the test would look like this:

    {'env': {'sub...s wrapped'}}}} == {'env': {'sub...}}}, 'new': 1}
    Omitting 1 identical items, use -vv to show
    Right contains 1 more item:
    {'new': 1}
    Full diff:
      {
       'env': {'sub': {'long_a': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
    -                  'sub1': {'long_a': 'substring '
    +                  'sub1': {'long_a': 'substring that gets wrapped'}}},
    ?                                                +++++++++++++++++ ++++
    +  'new': 1,
    -                                     'that '
    -                                     'gets '
    -                                     'wrapped'}}},
      }
 2019-11-06 11:23:15 +01:00
Daniel Hahler e7320c6b54
Merge pull request #5926 from AtakamaLLC/optional-multiline 
Add log-auto-indent option to control multiline formatting
 2019-11-06 00:35:24 +01:00
Daniel Hahler 00f67494e5
Merge pull request #6107 from MarcoGorelli/color-percentage-indicator 
Color percentage indicator
 2019-11-06 00:28:45 +01:00
Daniel Hahler 741f0fedd1 typing around Node.location, reportinfo, repr_excinfo etc 2019-11-05 16:22:58 +01:00
Zak Hassan f9e3a5395c Removing variable being reassigned 2019-11-04 21:11:54 -05:00
MarcoGorelli 0d79061432 Color percentage indicator according to color of final line 
indicate current outcome/status with color of percentage indicator

Fix type annotation, refactor _write_progress_information_filling_space

Keep code in _get_main_color as similar as possible to how it was before

Write test

Make black-compliant

Fix error in newly introduced test_collecterror

Make tests more readable by using constants and f-strings

Remove accidentally added monkeypatch

Make Python 3.5-compatible, add changelog entry

Add newline at the end of changelog file
 2019-11-04 19:57:07 +00:00
Ran Benita 7d3ce374d2 Add type annotations to _pytest.assertion.util 2019-11-03 20:28:43 +02:00
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