e4a52c1795
prevent doubleing of function level marks
2018-03-30 08:19:45 +02:00
dbb1b5a227
remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively
2018-03-29 18:24:10 +02:00
2cb7e725ce
document the hack used to avoid duplicate markers due Instance collectors
2018-03-29 17:52:01 +02:00
2d06ae0f65
base metafunc fixtureinfo on the functiondefinition to caputure its marks
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
360d608da4
introduce a own storage for markers
2018-03-29 17:52:01 +02:00
1fff81e21d
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-03-16 18:15:28 -03:00
988ace9eb2
Add documentation for marks
2018-03-06 20:41:20 -03:00
2cd69cf632
sort out import misstake
2018-02-22 15:18:17 +01:00
c8d24739ed
move current mark datastructures to own module
2018-02-22 14:43:01 +01:00
e12a588c39
Merge branch 'master' into typo_for_parametrize
2018-01-30 16:22:54 -06:00
547070e2d8
Switch `for_parameterize` to `for_parametrize`
2018-01-30 16:20:43 -06:00
bf2c10c810
parameterset: refactor marking empty parametersets
2018-01-26 11:10:00 +01:00
93306f6a5e
Merge remote-tracking branch 'upstream/master' into features
2018-01-09 18:41:00 -02:00
b6b36bc167
Handle pluggy package or module for traceback filtering
...
Since 0.6.1 pluggy has been turned into a package
2018-01-08 21:29:15 -02:00
afc607cfd8
move node base classes from main to nodes
2017-12-18 11:08:20 +01:00
912330a7e2
Extend _pytest.python._idval to return __name__ of functions as well, not just for classes
2017-11-29 16:17:49 +00:00
1f08d990d5
Deprecate metafunc.addcall
...
Fix #2876
2017-11-15 15:16:00 -02:00
983a09a2d4
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-11-10 18:33:02 -02:00
03829fde8a
Fix linting E741: ambiguous variable name
2017-11-04 13:59:10 -02:00
d7e8eeef56
Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate
...
deprecate the public internal PyCollector.makeitem method
2017-11-03 17:13:18 -02:00
821f9a94d8
deprecate the public internal PyCollector.makeitem method
2017-10-30 16:35:23 +01:00
4a436f2255
move responsibility for parameterset extraction into parameterset class
2017-10-27 17:55:07 +02:00
e7a4d3d8cf
Merge remote-tracking branch 'upstream/master' into features
2017-10-04 17:28:34 -03:00
df6d5cd4e7
Use ascii_escaped to escape unicode warnings
2017-10-03 12:19:37 -03:00
2802135741
fix 'DoctestItem' object has no attribute '_fixtureinfo'
...
* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)
2017-09-19 12:41:12 +02:00
ff35c17ecf
Drop wrapper module; import directly
2017-08-25 11:46:55 -04:00
eb462582af
fix #2675 - store marks correctly in callspecs
2017-08-10 19:46:36 +02:00
9e62a31b63
Merge pull request #2650 from srinivasreddy/2642
...
Fixed#2642: Convert py module references to six module
2017-08-04 09:21:51 +02:00
dc563e4954
convert py module references to six module
2017-08-04 08:05:03 +05:30
06a49338b2
make Test Outcomes inherit from BaseException instead of exception
...
fixes #580
2017-07-28 15:28:51 +02:00
3d89905114
Merge remote-tracking branch 'upstream/master' into features
2017-07-26 19:01:28 -03:00
72531f30c0
Improve error message for CollectError with skip/skipif
2017-07-25 15:14:28 +02:00
7e0553267d
Remove unused import.
2017-07-22 09:19:13 -07:00
a3b35e1c4b
Remove `raises` and `approx` from `python.py`.
...
These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow. This
commit removes them again to avoid out-of-date code duplication.
2017-07-22 08:36:15 -07:00
d44565f385
Merge remote-tracking branch 'upstream/master' into fix-flake8-errors
2017-07-19 17:57:30 -03:00
c92760dca8
Merge branch 'fix-flake8-issues'
2017-07-19 17:03:36 -03:00
7b1870a94e
Fix flake8 in features branch
2017-07-17 21:16:14 -03:00
4fd92ef9ba
Merge branch 'fix-flake8-issues' into features
2017-07-17 21:05:39 -03:00
b49e8baab3
Fixed E731 flake8 errors
...
do not assign a lambda expression, use a def
2017-07-17 01:44:23 +02:00
7248b759e8
Fixed E303 flake8 errors
...
too many blank lines (3)
2017-07-17 01:44:23 +02:00
b840622819
Fixed E302 flake8 errors
...
expected 2 blank lines, found 0
2017-07-17 01:44:23 +02:00
17a21d540b
Fixed E301 flake8 errors
...
expected 1 blank line, found 0
2017-07-17 01:44:23 +02:00
195a816522
Fixed E265 flake8 errors
...
block comment should start with ‘# ‘
2017-07-17 01:44:22 +02:00
8f3eb6dfc7
Fixed E261 flake8 errors
...
at least two spaces before inline comment
2017-07-17 01:44:22 +02:00
b226454582
Fixed E251 flake8 errors
...
unexpected spaces around keyword / parameter equals
2017-07-17 01:44:22 +02:00
617e510b6e
Fixed E231 flake8 errors
...
missing whitespace after ‘,’, ‘;’, or ‘:’
2017-07-17 01:44:22 +02:00
4b22f270a3
Fixed E226 flake8 errors
...
missing whitespace around arithmetic operator
2017-07-17 01:44:22 +02:00
2e8caefcab
Fixed E225 flake8 errors
...
missing whitespace around operator
2017-07-17 01:44:22 +02:00
Ronny Pfannschmidt
Bruno Oliveira
Alan Velasco
ST John
Oliver Bestwalter
Tyler Goodlet
Srinivas Reddy Thatiparthy
Daniel Hahler
Kale Kundert
Andras Tim