floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,937 Commits 32 Branches 205 Tags
52c42799181d25f38abb6dfc7fbde2a04ab00a43
Commit Graph

2283 Commits

Author SHA1 Message Date
Anthony Sottile
ef88251573 Merge pull request #3570 from sangongs/fix_stack_finalizer 
Continue to call finalizers in the stack when a finalizer raises an exception
 2018-06-11 19:07:59 -07:00
Bruno Oliveira
41125968d9 Check the exception matches the message for completeness 2018-06-11 20:33:13 -03:00
Bruno Oliveira
4fd66e8a42 Run black on test file 2018-06-11 20:32:08 -03:00
Guoqiang Zhang
a888bf182e Continue to call finalizers in the stack when a finalizer in a former scope raises an exception 2018-06-11 18:01:18 -04:00
Bruno Oliveira
04b65cfba0 Merge pull request #3565 from nicoddemus/xfail-test-request-garbage 
Attempt to fix test_request_garbage on Windows
 2018-06-11 15:23:47 -03:00
Ronny Pfannschmidt
61471df8da Merge pull request #3562 from nicoddemus/revert-callinfo-result 
Revert change of Callinfo.result default value
 2018-06-11 19:03:01 +02:00
Bruno Oliveira
5ea647a245 Attempt to fix flaky test_request_garbage on Windows 
Fix #3564
 2018-06-10 19:18:44 -03:00
Anthony Sottile
49f621de76 Print <undetermined location> instead of None for warnings 2018-06-10 10:51:36 -07:00
Bruno Oliveira
10b0b81346 Revert change of Callinfo.result default value 
As discussed in #3560, this should not go to master because this breaks
the API.

Reverts commits:

1a7dcd73cf
198e993969
 2018-06-10 11:47:58 -03:00
Alan Velasco
1a7dcd73cf Add a default value to CallInfo.result 2018-06-09 16:58:23 -07:00
Daniel Hahler
c30c137a95 Improve display of hint about --fulltrace with KeyboardInterrupt 
- display the location first
- display hint about --fulltrace in parenthesis
 2018-06-07 23:50:24 +02:00
Ronny Pfannschmidt
7f5cb46835 Merge pull request #3531 from hroncok/370b5 
Module docstrings in 3.7 are not part of Module node anymore
 2018-06-05 01:16:14 +02:00
Miro Hrončok
39ebdab1bc DRY in TestAssertionRewrite 2018-06-04 14:03:13 +02:00
Miro Hrončok
9a6fa33c69 Module docstrings in 3.7 are not part of Module node anymore 
Fixes https://github.com/pytest-dev/pytest/issues/3530
 2018-06-04 13:58:35 +02:00
Anthony Sottile
ff19f273a9 Use six to import queue instead of py.builtin._tryimport 2018-06-03 13:12:49 -07:00
Anthony Sottile
3d0717813a bytes() is a builtin in python2.6+ 2018-06-03 11:54:36 -07:00
Bruno Oliveira
1b16d649f9 Fix formatting of merged files 2018-05-25 18:21:48 -03:00
Bruno Oliveira
6f8547cc1a Merge branch 'master' into pre-commit-hook 2018-05-25 18:14:43 -03:00
Bruno Oliveira
93fdad28aa Merge pull request #3499 from jeffreyrack/3491-junit-logging 
3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.
 2018-05-24 20:50:16 -03:00
Ronny Pfannschmidt
9ed1289b01 run black on test_source_multiline_block.py 2018-05-24 12:12:12 +02:00
Ronny Pfannschmidt
da2c2e8492 more debugging for #3498 2018-05-24 09:58:36 +02:00
Ronny Pfannschmidt
74cfdc5feb add failing test for #3498 2018-05-24 07:30:38 +02:00
Jeffrey Rackauckas
b4e0265622 Removed whitespace from empty line. 2018-05-23 20:15:28 -07:00
Jeffrey Rackauckas
6c519b1280 Fixed a bug where stdout and stderr were logged twice by junitxml. 2018-05-23 19:34:45 -07:00
Ronny Pfannschmidt
57a55cd0a3 restore formatting of test_source_multiline_block 2018-05-23 20:26:13 +02:00
Ronny Pfannschmidt
d4bf2ff8f5 fix test_source 2018-05-23 18:22:18 +02:00
Ronny Pfannschmidt
3e08c4ee64 sort out flake8 issues and unicode name usage 2018-05-23 18:12:04 +02:00
Ronny Pfannschmidt
703e4b11ba run black 2018-05-23 16:48:46 +02:00
Ronny Pfannschmidt
3e1590bcfc sort out pyupgrade fallout 2018-05-23 16:45:58 +02:00
Ronny Pfannschmidt
3b9e063fe8 fix line endings 2018-05-23 16:45:23 +02:00
Ronny Pfannschmidt
9aacb4635e run pyupgrade 2018-05-23 16:45:09 +02:00
Bruno Oliveira
7d0c9837ce Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filter 
introduce name filtering for marker iteration again
 2018-05-21 13:24:39 -03:00
Bruno Oliveira
674879976f Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-05-18 12:30:08 -03:00
Bruno Oliveira
94e62dfc50 Increase hypothesis deadline 
The value is pretty close to the new default that will come out in
future hypothesis versions, which is generating a deprecation error
on CI.

Using a loose deadline because CI boxes are not reliable in how much
CPU power they have available
 2018-05-16 07:34:53 -03:00
Ville Skyttä
aa51fcb2b6 Spelling and grammar fixes 2018-05-13 12:06:09 +02:00
Ronny Pfannschmidt
4914135fdf introduce name filtering for marker iteration again 2018-05-11 21:48:15 +02:00
Bruno Oliveira
fa76a5c8fe Attempt to fix flaky test on Python 2 
This test sometimes fails on AppVeyor with:

```
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
.0 = <listiterator object at 0x0549DC50>
    leaked_types = sum(1 for _ in gc.garbage
>                   if 'PseudoFixtureDef' in str(_))
E   UnicodeEncodeError: 'ascii' codec can't encode character u'\u263a' in position 23: ordinal not in range(128)
test_request_garbage.py:19: UnicodeEncodeError
====================== 1 passed, 1 error in 1.39 seconds ======================
```

Use our internal "safe_repr" function to handle Encode errors: who knows
what objects are in garbage after all.
 2018-05-04 17:56:51 -03:00
Bruno Oliveira
dca77b2273 Escape whitespace only strings when diffing them on failed assertions 
Fix #3443
 2018-05-03 20:38:00 -03:00
Bruno Oliveira
35f53a7353 Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorage 
Fix #3441 let mark expressions be populated from the modern marker storage
 2018-05-03 19:27:07 -03:00
Ronny Pfannschmidt
e6a86e0f4c add tests for #3441 2018-05-03 17:33:59 +02:00
Ronny Pfannschmidt
a5cf55dd4a fix test_mark_option_custom - it used the legacy keyword storage for addign markers 2018-05-03 16:33:16 +02:00
Bruno Oliveira
1a880be85b Remove unused import to fix linting 2018-05-01 19:08:29 -03:00
Brian Maissy
c258fe1459 --pdb treats KeyboardInterrupt as exception 2018-05-02 00:58:35 +03:00
Bruno Oliveira
63368e07ea Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-04-24 21:26:45 -03:00
Bruno Oliveira
132fb61eba Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture 2018-04-23 22:24:53 -03:00
Bruno Oliveira
03850cf962 Add test for applying fixture twice 
Fix #2334
 2018-04-23 22:17:46 -03:00
Bruno Oliveira
3318e53d01 Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch 
#3290 improve monkeypatch
 2018-04-19 17:05:52 -03:00
Brian Maissy
857098fe0f added indicative error when parametrizing an argument with a default value 2018-04-15 20:52:57 +03:00
feuillemorte
ba7cad3962 #3290 Fix comments 2018-04-13 16:00:07 +03:00
Bruno Oliveira
aa95a425d7 Attempt to solve race-condition which corrupts .pyc files on Windows 
This uses of the `atomicwrites` library.

This is very hard to create a reliable test for.

Fix #3008
 2018-04-12 08:19:28 -03:00