1b16d649f9
Fix formatting of merged files
2018-05-25 18:21:48 -03:00
6f8547cc1a
Merge branch 'master' into pre-commit-hook
2018-05-25 18:14:43 -03:00
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
9ed1289b01
run black on test_source_multiline_block.py
2018-05-24 12:12:12 +02:00
da2c2e8492
more debugging for #3498
2018-05-24 09:58:36 +02:00
74cfdc5feb
add failing test for #3498
2018-05-24 07:30:38 +02:00
b4e0265622
Removed whitespace from empty line.
2018-05-23 20:15:28 -07:00
6c519b1280
Fixed a bug where stdout and stderr were logged twice by junitxml.
2018-05-23 19:34:45 -07:00
57a55cd0a3
restore formatting of test_source_multiline_block
2018-05-23 20:26:13 +02:00
d4bf2ff8f5
fix test_source
2018-05-23 18:22:18 +02:00
3e08c4ee64
sort out flake8 issues and unicode name usage
2018-05-23 18:12:04 +02:00
703e4b11ba
run black
2018-05-23 16:48:46 +02:00
3e1590bcfc
sort out pyupgrade fallout
2018-05-23 16:45:58 +02:00
3b9e063fe8
fix line endings
2018-05-23 16:45:23 +02:00
9aacb4635e
run pyupgrade
2018-05-23 16:45:09 +02:00
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
674879976f
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-05-18 12:30:08 -03:00
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
aa51fcb2b6
Spelling and grammar fixes
2018-05-13 12:06:09 +02:00
4914135fdf
introduce name filtering for marker iteration again
2018-05-11 21:48:15 +02:00
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
dca77b2273
Escape whitespace only strings when diffing them on failed assertions
...
Fix #3443
2018-05-03 20:38:00 -03:00
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
e6a86e0f4c
add tests for #3441
2018-05-03 17:33:59 +02:00
a5cf55dd4a
fix test_mark_option_custom - it used the legacy keyword storage for addign markers
2018-05-03 16:33:16 +02:00
1a880be85b
Remove unused import to fix linting
2018-05-01 19:08:29 -03:00
c258fe1459
--pdb treats KeyboardInterrupt as exception
2018-05-02 00:58:35 +03:00
63368e07ea
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-24 21:26:45 -03:00
132fb61eba
Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture
2018-04-23 22:24:53 -03:00
03850cf962
Add test for applying fixture twice
...
Fix #2334
2018-04-23 22:17:46 -03:00
3318e53d01
Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch
...
#3290 improve monkeypatch
2018-04-19 17:05:52 -03:00
857098fe0f
added indicative error when parametrizing an argument with a default value
2018-04-15 20:52:57 +03:00
ba7cad3962
#3290 Fix comments
2018-04-13 16:00:07 +03:00
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
015626ce69
Merge pull request #3384 from nicoddemus/leak-frame
...
Reset reference to failed test frame before each test executes
2018-04-12 07:53:34 -03:00
10a7160549
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-11 18:07:47 -03:00
3d60f955f0
#3290 Added test
2018-04-11 12:45:37 +03:00
78c900448e
Add acceptance test for #2798
2018-04-10 21:04:30 -03:00
2241c98b18
Merge pull request #3331 from tonybaloney/breakpoint_support
...
Support for the new builtin breakpoint function in Python 3.7
2018-04-10 07:15:29 +02:00
ec2d8223cf
Fix issue #3372
2018-04-06 14:16:12 +02:00
2018cf12b1
fix the record_property test
2018-04-05 14:05:26 +02:00
ba407b5eb6
Clear sys.last_* attributes before running an item
...
Otherwise we will keep the last failed exception around forever
Related to #2798
2018-04-04 20:36:07 -03:00
0762666bd1
Remove unused pytestPDB import
2018-04-03 08:58:40 -03:00
7c0c91a7a2
fix record_property test
2018-04-03 08:00:57 +02:00
4d847593b3
remove a test that would fail because pytest is being used to test itself
2018-04-03 10:40:56 +10:00
dbb1b5a227
remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively
2018-03-29 18:24:10 +02:00
159ea9b7c0
turn Markinfo into atts clsas, and return correct instances of it from node.get_marker
2018-03-29 17:52:01 +02:00
99015bfc86
fix most of metafunc tests by mocking
2018-03-29 17:52:01 +02:00
180ae09202
deprecate markinfo and fix up most marker scoping access while completely breaking metafunc testing
2018-03-29 17:52:01 +02:00
f1a1695aaa
enable deep merging test - new structure fixed it
2018-03-29 17:52:01 +02:00
Bruno Oliveira
Ronny Pfannschmidt
Jeffrey Rackauckas
Ville Skyttä
Brian Maissy
feuillemorte
Tim Strazny
Anthony Shaw