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

3747 Commits

Author SHA1 Message Date
Bruno Oliveira
886b8d27c6 Merge pull request #5984 from phloose/acceptance-tests_pytest-dev/pytest/#4445 
Add acceptance tests for "config warnings" stacklevel (#4445)
 2019-11-22 19:45:41 -03:00
Daniel Hahler
b0ebcfb785 pytester: remove special handling of env during inner runs 
Closes https://github.com/pytest-dev/pytest/issues/6213.
 2019-11-22 21:50:31 +01:00
Nikolay Kondratyev
5e097970df Fix line detection for properties in doctest tests 
Co-Authored-By: Daniel Hahler <github@thequod.de>
 2019-11-22 23:50:20 +03:00
Philipp Loose
a02310a140 Add stacklevel tests for warnings, 'location' to pytest_warning_captured 
Resolves #4445 and #5928 (thanks to allanlewis)

Add CHANGELOG for location parameter
 2019-11-22 17:50:00 -03:00
Daniel Hahler
2344982d7f main: wrap_session: handle exit.Exception with notify_exception 
Fixes https://github.com/pytest-dev/pytest/issues/6257.
Via https://github.com/blueyed/pytest/pull/132.
 2019-11-21 22:50:33 +01:00
Daniel Hahler
df0c652333 Merge master into features 2019-11-21 20:31:52 +01:00
Mark Dickinson
64eb9ea670 Modify test for new expected behaviour 2019-11-21 11:50:40 +00:00
Ran Benita
5820c5c5a6 Merge pull request #6241 from bluetech/type-annotations-9 
Add type annotations to _pytest.config.argparsing and corresponding Config code
 2019-11-21 13:33:13 +02:00
Daniel Hahler
ed012c808a Merge pull request #6174 from blueyed/ids-iter 
parametrized: ids: support generator/iterator
 2019-11-21 00:37:25 +01:00
Daniel Hahler
6b75a7733b Merge pull request #6247 from blueyed/collecterror-fulltrace 
Respect --fulltrace with collection errors
 2019-11-21 00:27:23 +01:00
Daniel Hahler
2d449e95e4 Respect --fulltrace with collection errors 2019-11-20 23:35:33 +01:00
Ran Benita
dac16cd9e5 Add type annotations to _pytest.config.argparsing and corresponding Config code 2019-11-20 22:02:27 +02:00
Daniel Hahler
2c941b5d13 parametrized: ids: support generator/iterator 
Fixes https://github.com/pytest-dev/pytest/issues/759

- Adjust test_parametrized_ids_invalid_type, create list to convert tuples
  Ref: https://github.com/pytest-dev/pytest/issues/1857#issuecomment-552922498

- Changelog for int to str conversion
  Ref: https://github.com/pytest-dev/pytest/issues/1857#issuecomment-552932952
 2019-11-20 19:02:17 +01:00
Daniel Hahler
ccb3ef3b33 testing/python/metafunc.py: import _idval once 2019-11-20 18:02:30 +01:00
Ran Benita
51f9cd0e02 argparsing: remove "map_long_option" Action attribute support 
This feature was added in commit
007a77c2ba, but was never used in pytest
itself. A GitHub code search doesn't find any users either (only pytest
repo copies). It seems safe to clean up.
 2019-11-20 17:09:24 +02:00
Daniel Hahler
2228ccbfb4 pytester: reset log output in _match_lines (#70) 
This is necessary for when using e.g. `no_fnmatch_line` after it.
Factor it out into `_fail`.

(cherry picked from commit aade7ed0045ba32557ef8565cbab28a2c91053a7)

Ref: https://github.com/pytest-dev/pytest/pull/5914#issuecomment-549182242
 2019-11-20 05:24:18 +01:00
Bruno Oliveira
5b3867fd65 Release 5.3.0 (#6233) 
Release 5.3.0
 2019-11-19 18:49:14 -03:00
Anthony Sottile
faea273c93 Revert "A warning is now issued when assertions are made for None" 2019-11-19 08:24:08 -08:00
Bruno Oliveira
21622d0df4 Merge remote-tracking branch 'upstream/master' into release-5.3.0 2019-11-19 12:42:11 -03:00
Daniel Hahler
4ad61cbcf6 Improve check for misspelling of parametrize 
- there is no need to do this with `--strict-markers`
- it can be done when looking up marks, instead of for every generated
  test
 2019-11-19 16:05:52 +01:00
Anthony Sottile
63a23d876c Remove check for os.symlink, always there in py3+ 2019-11-18 16:01:44 -08:00
Anthony Sottile
eeeb19626b Merge pull request #6202 from linw1995/fix_getmodpath 
Fix incorrect result of getmodpath method.
 2019-11-18 15:14:52 -08:00
Bruno Oliveira
89eeefbbaf Merge pull request #6192 from nicoddemus/remove-reportlog-6180 
Remove report_log in favor of pytest-reportlog
 2019-11-18 17:58:37 -03:00
Daniel Hahler
2ad2fbc9a2 Metafunc: remove hack for DefinitionMock 
Done initially in 99015bfc8.
 2019-11-18 18:19:34 +01:00
林玮
5d5f480979 Hardening an existing test for demonstrating this change. 2019-11-18 23:46:38 +08:00
JoshKarpel
1e3be8ada4 fix whitespace issues in tests for #2049 2019-11-17 17:14:17 -06:00
JoshKarpel
9e759010d9 resolve #2049 2019-11-17 16:45:42 -06:00
Anthony Sottile
a2d48332fc Merge pull request #6201 from asottile/mm 
Merge master into features
 2019-11-17 11:30:51 -08:00
Daniel Hahler
bac6eebfff tests: revisit test_cacheprovider (#6199) 2019-11-17 19:23:16 +01:00
Ran Benita
fa578d7329 Merge pull request #6205 from bluetech/type-annotations-8 
Add type annotations to _pytest.compat and _pytest._code.code
 2019-11-17 09:45:32 +02:00
Daniel Hahler
b9a3ba1fe8 test_cache_writefail_permissions: ignore any other plugins 2019-11-16 23:29:24 +01:00
Daniel Hahler
1b4623a6d1 tests: revisit test_cacheprovider 2019-11-16 23:29:24 +01:00
Ran Benita
eaa34a9df0 Add type annotations to _pytest._code.code 2019-11-16 22:29:57 +02:00
Daniel Hahler
54a954514b re-run black 2019-11-16 18:55:32 +01:00
Ran Benita
307add025b Simplify a FormattedExcinfo test 
The previous test was better in that it used fakes to test all of the
real code paths. The problem with that is that it makes it impossible to
simplify the code with `isinstance` checks. So let's just simulate the
issue directly with a monkeypatch.
 2019-11-16 17:22:09 +02:00
Ran Benita
5bfe793fd5 Remove unneeded getrawcode() calls from tests 2019-11-16 17:22:08 +02:00
Ran Benita
c7a83a0f31 Remove a PyPy version check for an unsupported version 
pytest doesn't support these PyPy versions anymore, so no need to have
checks for them.
 2019-11-16 17:22:07 +02:00
Anthony Sottile
cc78444c30 Merge remote-tracking branch 'origin/master' into mm 2019-11-15 15:26:57 -08:00
Daniel Hahler
c49c61fdaf Import Path from _pytest.pathlib for py35 (#6193) 2019-11-15 23:17:43 +01:00
Daniel Hahler
1abb08d52f tests: use sys.dont_write_bytecode 
Setting PYTHONDONTWRITEBYTECODE in the environment does not change it
for the current process.
 2019-11-15 23:13:08 +01:00
Daniel Hahler
5979837c60 Import Path from _pytest.pathlib for py35 
This is important for `isinstance` checks etc.
 2019-11-15 22:19:53 +01:00
Anthony Sottile
4e0f99260d Add regression tests for __init__.py breakage 2019-11-15 13:19:31 -08:00
Anthony Sottile
176c7771fb Revert "fix bug with nonskipped first test in package (#5831)" 
This reverts commit 85288b5321, reversing
changes made to 5f9db8a017.
 2019-11-15 08:29:52 -08:00
Bruno Oliveira
d2ea9e2db5 Remove report_log in favor of pytest-reportlog 
Fix #6180
 2019-11-14 19:47:26 -03:00
Bruno Oliveira
6f2c0fd2e8 Show a better message when 'request' is used in parametrize 
Fix #6183
 2019-11-13 19:57:10 -03:00
Bruno Oliveira
2a67637acc Issue a warning to prepare change of 'junit_family' default value 
Fix #6179
 2019-11-13 19:55:13 -03:00
Daniel Hahler
f91bf48a40 Merge pull request #6176 from blueyed/assertoutcome 
pytester: Hookrecorder: improve assertoutcome
 2019-11-13 19:27:18 +01:00
Daniel Hahler
a6e10cc2e3 Merge pull request #6181 from blueyed/maxfail-terminal-upstream 
terminal: report ``session.shouldfail`` reason (``-x``)
 2019-11-13 19:27:01 +01:00
Daniel Hahler
b06f33f474 terminal: report `session.shouldfail reason (-x`) 
Via https://github.com/blueyed/pytest/pull/108.
 2019-11-13 16:18:41 +01:00
Daniel Hahler
6ddf7c3d42 pytester: Hookrecorder: improve assertoutcome 
Before:

        def assertoutcome(self, passed: int = 0, skipped: int = 0, failed: int = 0) -> None:
            realpassed, realskipped, realfailed = self.listoutcomes()
            assert passed == len(realpassed)
    >       assert skipped == len(realskipped)
    E       assert 1 == 0
    E        +  where 0 = len([])

After:

    >       reprec = testdir.inline_run(testpath, "-s")
    E       AssertionError: ([], [], [<TestReport 'nodeid' when='call' outcome='failed'>])
    E       assert {'failed': 1, 'passed': 0, 'skipped': 0} == {'failed': 0, 'passed': 0, 'skipped': 1}
 2019-11-13 13:48:20 +01:00