floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,013 Commits 32 Branches 205 Tags
dbd082af961871c59f2dbcda2fcb27faf4fa2ebc
Commit Graph

2298 Commits

Author SHA1 Message Date
Anthony Sottile
8616a5f1d9 Preserve newlines when captured with capfd 2020-07-20 10:31:20 -07:00
Lewis Cowles
71ab6236a1 Clearer guidance on pytest.raise(match=...) failure (#7499) 2020-07-15 22:26:47 +03:00
Bruno Oliveira
e7c42ae62b Inaccessible lock files now imply temporary directories can't be removed 
Fix #7500

Co-authored-by: Ran Benita <ran@unusedvar.com>
 2020-07-15 09:25:17 -03:00
Ran Benita
41c40efe80 Merge pull request #7496 from bluetech/typing-idfn 
Fix typing of params ids callable form
 2020-07-15 10:25:46 +03:00
Ran Benita
fe1fcfd081 Merge pull request #7490 from bluetech/fix-dynamic-runtest-xfail 
skipping: fix dynamic xfail mark added in runtest not respected
 2020-07-15 10:25:29 +03:00
Ran Benita
bc17034a67 Fix typing of params ids callable form 
The previous typing had an object passed to the user, which they can't
do anything with without asserting, which is inconvenient. Change it to
Any instead.

Note that what comes *back* to pytest (the return value) should be an
`object`, because we want to handle arbitrary objects without assuming
anything about them.
 2020-07-14 14:53:42 +03:00
Ran Benita
1a73e78698 mark: fix typing for @pytest.mark.xfail(raises=...) 2020-07-14 01:39:04 +03:00
Ran Benita
ccad10a829 skipping: fix dynamic xfail mark added in runtest not respected 
If a test runtest phase (not setup) dynamically adds a pytest.mark.xfail
mark to the item, it should be respected, but it wasn't. This regressed
in 3e6fe92b7e (not released).

Fix it by just always refreshing the mark if needed. This is mostly what
was done before but in a more roundabout way.
 2020-07-14 01:02:06 +03:00
Ran Benita
78f2dc08fa skipping: slight simplification 2020-07-14 00:45:12 +03:00
Bruno Oliveira
07f5f6fd4a Merge pull request #7481 from bluetech/tw-unicode-escape 
terminalwriter: bring back handling of printing characters not supported by stdout
 2020-07-11 16:01:45 -03:00
Simon K
7f467ebc9a Create subdirectories if they do not exist when specified for log file (#7468) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-07-11 13:40:28 -03:00
Ran Benita
7b65b2337b Merge pull request #7472 from bluetech/cleanups-4 
Some minor fixes & type annotations
 2020-07-11 19:05:07 +03:00
Ran Benita
113339b029 terminalwriter: bring back handling of printing characters not supported by stdout 2020-07-11 18:59:00 +03:00
Bruno Oliveira
d466cc25a7 Merge pull request #7424 from nicoddemus/package-scope-experimental-7389 
Remove package scope experimental status
 2020-07-11 08:44:34 -03:00
Bruno Oliveira
0b58f73d44 Merge pull request #7476 from bluetech/pylint-callable 
mark/structure: fix pylint complaining that builtin marks are not callable
 2020-07-10 17:26:37 -03:00
Ran Benita
c1ca42b5c2 mark/structure: fix pylint complaining that builtin marks are not callable 2020-07-10 23:10:17 +03:00
Hugo van Kemenade
c1c5a2b34a Add support for NO_COLOR and FORCE_COLOR (#7466) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-07-10 08:49:10 -03:00
Ran Benita
c8676002a7 code/code: remove redundant __ne__ implementation 
This implementation is the default when __eq__ is implemented.
 2020-07-10 13:08:56 +03:00
Ran Benita
85ef2bf698 code/code: remove Frame.exec_() method 
Not used.
 2020-07-10 13:08:56 +03:00
Ran Benita
c3864bc12b code/code: remove Frame.is_true() method 
Really odd one, let's just inline it.
 2020-07-10 13:08:56 +03:00
Ran Benita
77f3cb4baa code/code: type annotations & doc cleanups 2020-07-10 13:08:56 +03:00
Ran Benita
087b047426 cacheprovider: type annotations 2020-07-10 13:08:56 +03:00
Ran Benita
a2f021b6f3 Remove no longer needed noqa: F821 uses 
Not needed since pyflakes 2.2.0.
 2020-07-10 13:08:56 +03:00
Ran Benita
fc702ab7e4 fixtures: some type annotations 2020-07-10 13:08:56 +03:00
Ran Benita
168d9adefc hookspec: change Node -> Union[Item, Collector] to avoid exposing Node 
We don't really want `Node` itself as a public API, only its two
subclasses.
 2020-07-10 13:08:56 +03:00
Ran Benita
8e8d639276 tmpdir: type annotations 2020-07-10 13:08:56 +03:00
Ran Benita
bcff02c4c6 pytester: some type annotations 2020-07-10 13:08:56 +03:00
Ran Benita
c7a1db5d01 junitxml: few typing fixes & additions 2020-07-10 13:08:56 +03:00
Ran Benita
5da4a1d84f capture: type annotate return value of fixtures 2020-07-10 13:08:56 +03:00
Ran Benita
e079ebbd57 python: more type annotations 2020-07-10 13:08:56 +03:00
Ran Benita
fb2640b82f Stop using ExceptionInfo.errisinstance internally 
It does the same as a simple isinstance check, but adds a little layer
of obscurity on top, which the type checker can't penetrate.
 2020-07-10 13:08:48 +03:00
Arvin Firouzi
c3e2b11a62 Fix reported location of skip when --runxfail is used (#7432) 
Co-authored-by: Arvin Firouzi <427014@student.fontys.nl>
 2020-07-09 23:10:32 +03:00
Vlad-Radz
678c1a0745 assertion: improve diff output of recursive dataclass/attrs 
Co-authored-by: Vlad <uladzislau.radziuk@nordcloud.com>
 2020-07-08 19:04:56 +03:00
Bruno Oliveira
93d2ccbfb7 Point to stable docs instead of latest 
Now that our master might contain new features, it is best to point
users to the stable docs rather than the latest
 2020-07-07 07:45:27 -03:00
Ran Benita
ef62b865f0 Merge pull request #7448 from bluetech/typing-publish 
Publish our types
 2020-07-05 16:51:26 +03:00
Ran Benita
2bcad38fbd Publish our types 2020-07-04 13:18:15 +03:00
Ran Benita
36b958c99e Merge pull request #7438 from bluetech/source-cleanups 
code/source: some cleanups
 2020-07-04 12:57:32 +03:00
Ran Benita
64dd7000e5 Merge pull request #7436 from bluetech/cleanup-lsof 
pytester: slightly clean up LsofFdLeakChecker
 2020-07-04 10:55:11 +03:00
Ran Benita
eced536eaf Merge pull request #7435 from bluetech/python-cleanups 
python: a few cleanups
 2020-07-04 10:54:07 +03:00
Gleb Nikonorov
e596b26f1a Don't quote the Match type since it's imported from Typing 2020-07-02 18:22:54 -04:00
Gleb Nikonorov
04d052e306 fix mypy issue by using typing Match instead of re.Match 2020-07-02 15:32:23 -04:00
Ran Benita
f5c69f3eb2 code/source: inline getsource() 
The recursive way in which Source and getsource interact is a bit
confusing, just inline it.
 2020-07-01 20:20:13 +03:00
Ran Benita
ef39115001 code/source: remove compiling functions 
A lot of complex code that isn't used anymore outside of tests after
the previous commit.
 2020-07-01 20:20:12 +03:00
Ran Benita
9640c9c9eb skipping: use plain compile() instead of _pytest._code.compile() 
eval() is used for evaluating string conditions in skipif/xfail e.g.

    @pytest.mark.skipif("1 == 0")

This is the only code that uses `_pytest._code.compile()`, so removing
its last use enables us to remove it entirely.

In this case it doesn't add much. Plain compile() gives a good enough
error message.

For regular exceptions, the message is the same.

For SyntaxError exceptions, e.g. "1 ==", the previous code adds a little
bit of useful context:

```
invalid syntax (skipping.py:108>, line 1)

The above exception was the direct cause of the following exception:
1 ==
     ^
(code was compiled probably from here: <0-codegen /pytest/src/_pytest/skipping.py:108>) (line 1)

During handling of the above exception, another exception occurred:
Error evaluating 'skipif' condition
    1 ==
         ^
SyntaxError: invalid syntax
```

The new code loses it:

```
unexpected EOF while parsing (<skipif condition>, line 1)

During handling of the above exception, another exception occurred:
Error evaluating 'skipif' condition
    1 ==
        ^
SyntaxError: invalid syntax
```

Since the old message is a minor improvement to an unlikely error
condition in a deprecated feature, I think it is not worth all the code
that it requires.
 2020-07-01 20:20:12 +03:00
Ran Benita
4a27d7d973 code/source: remove unused method Source.putaround() 2020-07-01 20:20:11 +03:00
Ran Benita
a7303b52db code/source: remove unused method Source.isparseable() 2020-07-01 20:20:11 +03:00
Ran Benita
a127a22d13 code/source: remove support for comparing Source with str 
Cross-type comparisons like this are a bad idea. This isn't used.
 2020-07-01 20:20:10 +03:00
Ran Benita
2b99bfbc60 code/source: remove support for passing multiple parts to Source 
It isn't used, so keep it simple.
 2020-07-01 20:20:09 +03:00
Ran Benita
c83e16ab2e code/source: remove unneeded assert 
inspect.getsource() definitely returns str.
 2020-07-01 20:20:09 +03:00
Ran Benita
c6083ab970 code/source: remove old IndentationError workaround in getsource() 
This has been there since as far as the git history goes (2007), is not
covered by any test, and says "Buggy python version consider upgrading".
Hopefully everyone have upgraded...
 2020-07-01 20:20:08 +03:00