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

3714 Commits

Author SHA1 Message Date
Bruno Oliveira
03bf27f4df Merge pull request #7242 from nicoddemus/fix-flaky-test 
Introduce _pytest.timing as a way to control timing during internal tests

Conflicts:
  	src/_pytest/pytester.py
	  src/_pytest/runner.py
	  src/_pytest/terminal.py
  	testing/acceptance_test.py
 2020-06-02 20:39:00 -03:00
Tor Colvin
56e6482405 Fix removal of very long paths on Windows (#6755) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-06-02 08:58:01 -03:00
Bruno Oliveira
589176e9fe Merge pull request #7285 from nicoddemus/backport-7220 
[5.4] Merge pull request #7220 from nicoddemus/issue-6428
 2020-05-30 21:00:53 -03:00
Bruno Oliveira
e1a21e46b0 Merge pull request #7220 from nicoddemus/issue-6428 2020-05-30 20:14:57 -03:00
Bruno Oliveira
551400e8d6 Do not call TestCase.tearDown for skipped tests (#7236) 
Fix #7215
 2020-05-30 14:34:45 -03:00
Anthony Sottile
21ca38b932 Merge pull request #7257 from DahlitzFlorian/fix-issue-6956 
Prevent pytest from printing ConftestImportFailure traceback

(cherry picked from commit b3db440d4c)
 2020-05-27 13:52:10 -07:00
Anthony Sottile
af6548a4e7 Merge pull request #7244 from DahlitzFlorian/fix-issue-7150 
Prevent hiding underlying exception when ConfTestImportFailure is raised

(cherry picked from commit 45f53266e6)
 2020-05-23 12:13:34 -07:00
Bruno Oliveira
25b53c4196 Merge pull request #7188 from asottile/backport_7179 2020-05-08 06:58:08 -03:00
Anthony Sottile
d18e426b24 Merge pull request #7186 from asottile/is_setup_py_encoding_agnostic 
Fix _is_setup_py for files encoded differently than locale
 2020-05-07 14:02:00 -07:00
Bruno Oliveira
e83fa48dd1 Merge pull request #7179 from asottile/py39 2020-05-07 13:57:10 -07:00
Bruno Oliveira
3886c6d735 Merge pull request #7168 from nicoddemus/saferepr-getattr-fail-7145 2020-05-06 17:59:42 -03:00
Bruno Oliveira
5ca08e9b8a Merge pull request #7151 from nicoddemus/unittest-cleanup-6947 2020-05-02 15:44:39 -03:00
Bruno Oliveira
da615a4fbe Merge pull request #7144 from nicoddemus/async-testcase-7110 2020-05-01 16:45:01 -03:00
Bruno Oliveira
2a0bbfe63f Merge pull request #7143 from nicoddemus/file-from-parent 2020-05-01 13:08:42 -03:00
Ronny Pfannschmidt
a600e7a2a4 Merge pull request #7068 from RonnyPfannschmidt/backport-6927-run-async-unittest 
backport #6927: run async testcase methods
 2020-04-10 13:11:05 +02:00
Ronny Pfannschmidt
f5e430fd8f Merge pull request #6927 from RonnyPfannschmidt/fix-6924-run-async-stdlib-unittests 
running stdlib asyncio unittests again
 2020-04-10 08:16:58 +02:00
Ronny Pfannschmidt
38a4c7e56c Merge pull request #6986 from RonnyPfannschmidt/fix-6951-tw.writer-writable 
fix #6951: allow to write TerminalReporter.writer
 2020-04-10 08:12:34 +02:00
Daniel Hahler
554f600fb4 Fix TerminalRepr instances to be hashable (#6988) (#7006) 
pytest-xdist assumes `ExceptionChainRepr` is hashable.

Fixes https://github.com/pytest-dev/pytest/issues/6925.
Fixes https://github.com/pytest-dev/pytest-xdist/issues/515.

(cherry picked from commit 20f6331afd)
 2020-04-03 10:59:23 +02:00
Ran Benita
e3a3c90d94 [5.4.x] Fix crash when printing while capsysbinary is active (#7002) 
Backport of 1fda861190 from master.
 2020-04-02 14:31:32 +03:00
Bruno Oliveira
b9e2cd0a81 Merge pull request #6914 from nicoddemus/revert-6330 
Revert "[parametrize] enforce explicit argnames declaration (#6330)"
 2020-03-13 10:18:06 -03:00
Bruno Oliveira
a84fcbf5b2 Revert "[parametrize] enforce explicit argnames declaration (#6330)" 
This reverts commit 9e262038c8.

Fix #6909
 2020-03-13 09:59:53 -03:00
Bruno Oliveira
3267f64724 Merge pull request #6910 from nicoddemus/resultlog-logreport 
Handle unknown stats in pytest_report_teststatus hook
 2020-03-13 09:30:14 -03:00
Daniel Hahler
db92cea14c black: --target-version py35 (#6872) 2020-03-08 01:24:31 +01:00
Daniel Hahler
bce1d40fb0 tests: harden test_reprcompare_notin, factor out callop (#6764) 
* tests: assertion: factor out `callop`, typing

* tests: harden test_reprcompare_notin
 2020-03-08 01:23:19 +01:00
Daniel Hahler
dc86fb6758 pre-commit run --all-files 2020-03-07 23:47:55 +01:00
Ran Benita
b1d7a187f2 Add setdefault() method to Store 
Can be useful in some cases.
 2020-03-06 11:42:20 +02:00
Daniel Hahler
acec0b688f Fix usage of pytester with doctests (#6802) 
Use `request.node.name` instead of `request.function.__name__`:
`request.function` is `None` with `DoctestItem`s.
 2020-03-04 05:33:50 +01:00
Ronny Pfannschmidt
9fd71d6fe0 fix #571: deprecate pytest_collect_directory as ... (#6847) 
Deprecate pytest_collect_directory

Fix #571

Co-authored-by: Daniel Hahler <github@thequod.de>
 2020-03-03 18:58:14 -03:00
Ronny Pfannschmidt
194b52145b Merge pull request #6834 from RonnyPfannschmidt/fix-6833-summarize-warning-item-locations 
summarize warning summaries if the number of locations is high
 2020-03-01 20:21:36 +01:00
Ronny Pfannschmidt
23c43a37e0 summarize warning summaries if the number of locations is high 2020-03-01 14:08:15 +01:00
Bruno Oliveira
92767fec51 Merge pull request #6836 from bluetech/store 
Add a typing-compatible mechanism for ad-hoc attributes on various objects
 2020-03-01 09:30:10 -03:00
Bruno Oliveira
ff7b5dbbde Merge pull request #6784 from nicoddemus/deprecate-terminal-writer 
Deprecate TerminalReporter.writer
 2020-02-28 21:07:02 -03:00
Daniel Hahler
5819536f00 Improve UsageError with invalid -o style (#6795) 
This started from fixing the test, where `"xdist_strict True"` was used
as a single argument, although you typically would see `["xdist_strict",
"True"]`.

Improves the error message to mention the option that caused the error.
 2020-02-28 19:41:56 +01:00
Daniel Hahler
952cab2d85 Simplify test_rootdir_wrong_option_arg (#6812) 2020-02-28 18:38:07 +01:00
Ran Benita
d636fcd557 Add a typing-compatible mechanism for ad-hoc attributes on various objects 
pytest has several instances where plugins set their own attributes on
objects they receive in hooks, like nodes and config. Since plugins are
detached from these object's definition by design, this causes a problem
for type checking because these attributes are not defined and mypy
complains.

Fix this by giving these objects a "store" which can be used by plugins
in a type-safe manner.

Currently this mechanism is private. We can consider exposing it at a
later point.
 2020-02-28 14:34:44 +02:00
Daniel Hahler
6a7df7f031 test_assertion: harden/improve test_{text_diff,unicode} (#6806) 2020-02-24 15:19:08 +01:00
Daniel Hahler
ac3a42bafd doctest: strip newlines with unexpected exceptions (#6801) 2020-02-24 15:18:08 +01:00
Daniel Hahler
bfd0d18371 tests: test_config: move tests (#6796) 
Originally added in a2891420d (with `TestRootdir`), but then
accidentally moved to `TestOverrideIniArgs` in 802755cee.
 2020-02-23 17:12:55 +01:00
Daniel Hahler
706ea86bba capture: factor out _get_multicapture (#6788) 
Ref: https://github.com/pytest-dev/pytest/pull/6671#issuecomment-588408992
 2020-02-22 23:39:20 +01:00
Daniel Hahler
c8b4a1a471 Handle match with pytest.raises() (#6753) 
Fixes https://github.com/pytest-dev/pytest/issues/6752.
 2020-02-22 23:32:55 +01:00
Daniel Hahler
68fe0eb8f3 Minor cosmetic fixes (#6792) 2020-02-22 19:24:41 +01:00
Daniel Hahler
478a244f5e main: args must be a list, not tuple (#6791) 
Passing in a tuple crashes in `_prepareconfig`:

        def test_invoke_with_tuple(self):
    >       pytest.main(("-h",))

    src/_pytest/config/__init__.py:82: in main
        config = _prepareconfig(args, plugins)
    src/_pytest/config/__init__.py:229: in _prepareconfig
        return pluginmanager.hook.pytest_cmdline_parse(
    …
    src/_pytest/helpconfig.py:98: in pytest_cmdline_parse
        config = outcome.get_result()  # type: Config
    src/_pytest/config/__init__.py:808: in pytest_cmdline_parse
        self.parse(args)
    src/_pytest/config/__init__.py:1017: in parse
        self._preparse(args, addopts=addopts)
    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

        def _preparse(self, args: List[str], addopts: bool = True) -> None:
            …
            if addopts:
                ini_addopts = self.getini("addopts")
                if ini_addopts:
    >               args[:] = self._validate_args(ini_addopts, "via addopts config") + args
    E               TypeError: can only concatenate list (not "tuple") to list

    addopts    = True
    args       = ('-h',)
    env_addopts = ''
    ini_addopts = ['-rfEX', …]

    src/_pytest/config/__init__.py:956: TypeError: can only concatenate list (not "tuple") to list

Might be worth handling (converting it to a list for example), but it
was documented to be a list to begin with when removing support for
strings (a7e401656).
 2020-02-22 13:16:46 +01:00
Daniel Hahler
1baeefc2fd test_reprcompare_whitespaces: use callequal 2020-02-22 13:15:17 +01:00
Daniel Hahler
2be06ba67e Improve doc/typing/message for ExceptionInfo.match (#6776) 2020-02-21 16:41:57 +01:00
Daniel Hahler
8e991a622c tests: harden/improve test_itemreport_subclasses_show_subclassed_file (#6467) 
* tests: harden test_itemreport_subclasses_show_subclassed_file

* extend test_itemreport_subclasses_show_subclassed_file
 2020-02-21 15:24:12 +01:00
Daniel Hahler
b099fcfa33 tests: runner: improve/ignore coverage (#6781) 2020-02-21 14:37:56 +01:00
Daniel Hahler
81a9df6ed1 tests: fix flaky test_timeout (#6773) 
Use a longer timeout on CI - seen a failure with it with GHA (Windows).

Ref: a4554e666a
 2020-02-21 12:52:31 +01:00
Bruno Oliveira
435ad221f9 Deprecate TerminalReporter.writer 
Fix #6779
 2020-02-20 21:04:49 -03:00
Daniel Hahler
d1b50526fa tests: harden some UsageError tests (matching the error msg) (#6775) 2020-02-20 13:29:59 +01:00
Daniel Hahler
fb16d3e27a capture: revisit/fix __repr__, define _in_suspended (#6749) 2020-02-20 00:51:57 +01:00