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

100 Commits

Author SHA1 Message Date
Ronny Pfannschmidt
17a1ed5edf use a constant to sort out repeated use of the EMPTY_PARAMETERSET_OPTION 2018-01-26 12:12:26 +01:00
Ronny Pfannschmidt
a54cd4c2fd correct testing and usage of the empty_parameter_set_mark config option 2018-01-26 12:05:52 +01:00
Ronny Pfannschmidt
d550c33cd0 s/empty_parameterset/empty_parameter_set_mark 2018-01-26 11:56:24 +01:00
Ronny Pfannschmidt
37b41de779 fix #2527 - introduce a option to pic the empty parameterset action 2018-01-26 11:10:00 +01:00
Ronny Pfannschmidt
bf2c10c810 parameterset: refactor marking empty parametersets 2018-01-26 11:10:00 +01:00
Bruno Oliveira
af37778b0d All classes now subclass object for better py3 compatibility 
Fix #2147
 2018-01-24 18:23:42 -02:00
feuillemorte
8433e2ba04 #2953 fix comments: fix exception type 2018-01-16 23:35:57 +03:00
feuillemorte
648d5d0c6b #2953 fix comments: use keyword module 2018-01-16 22:55:24 +03:00
feuillemorte
076fb56f85 show a simple and easy error when keyword expressions trigger a syntax error 2018-01-16 21:30:44 +03:00
Bruno Oliveira
f50ace7c0a Merge remote-tracking branch 'upstream/master' into release-3.3.0 2017-11-23 20:20:40 +00:00
Sviatoslav Abakumov
5e71ffab87 Handle marks without description 2017-11-22 15:47:15 +03:00
Bruno Oliveira
983a09a2d4 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-11-10 18:33:02 -02:00
Bruno Oliveira
03829fde8a Fix linting E741: ambiguous variable name 2017-11-04 13:59:10 -02:00
Bruno Oliveira
e351976ef4 Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs 2017-11-04 12:32:27 -02:00
Ronny Pfannschmidt
b18a9deb4c Merge pull request #2892 from nicoddemus/merge-master-into-features 
Merge upstream/master into features
 2017-11-04 08:15:28 +01:00
Bruno Oliveira
f3a119c06a Merge upstream/master into features 2017-11-03 16:37:18 -02:00
Ronny Pfannschmidt
07b2b18a01 introduce attrs as dependency and use it 
for FixtureFunctionMarker and marks
 2017-10-30 17:04:42 +01:00
Ronny Pfannschmidt
4a436f2255 move responsibility for parameterset extraction into parameterset class 2017-10-27 17:55:07 +02:00
Bruno Oliveira
4e581b637f Use zip and map from six 2017-10-24 22:13:32 -02:00
Bruno Oliveira
6821d36ca5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-10-24 19:57:14 -02:00
Sviatoslav Abakumov
52aadcd7c1 Strip whitespace from markers in INI config 
Resolves #2856.
 2017-10-24 14:18:39 +03:00
Matty G
11b391ff49 Update mark.py 2017-10-17 14:11:07 -07:00
Bruno Oliveira
e7a4d3d8cf Merge remote-tracking branch 'upstream/master' into features 2017-10-04 17:28:34 -03:00
Xuan Luong
7093d8f65e Add example of -k 'not test' in help text 2017-09-30 18:43:20 -04:00
Bruno Oliveira
3ebfb881c9 Merge remote-tracking branch 'upstream/master' into features 2017-09-18 19:10:31 -03:00
Xuan Luong
1e93089165 [bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object 2017-09-09 01:31:08 -04:00
Ronny Pfannschmidt
eb462582af fix #2675 - store marks correctly in callspecs 2017-08-10 19:46:36 +02:00
Ronny Pfannschmidt
65b2de13a3 fix #2540, introduce mark.with_args 2017-07-21 13:37:09 +02:00
Bruno Oliveira
26ee2355d9 Merge remote-tracking branch 'upstream/features' into fix-flake8-errors 2017-07-19 17:09:05 -03:00
Ronny Pfannschmidt
62556bada6 remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage 
fixes #2573
 2017-07-19 08:44:52 +02:00
Bruno Oliveira
7b1870a94e Fix flake8 in features branch 2017-07-17 21:16:14 -03:00
Bruno Oliveira
4fd92ef9ba Merge branch 'fix-flake8-issues' into features 2017-07-17 21:05:39 -03:00
Andras Tim
7248b759e8 Fixed E303 flake8 errors 
too many blank lines (3)
 2017-07-17 01:44:23 +02:00
Andras Tim
b840622819 Fixed E302 flake8 errors 
expected 2 blank lines, found 0
 2017-07-17 01:44:23 +02:00
Andras Tim
17a21d540b Fixed E301 flake8 errors 
expected 1 blank line, found 0
 2017-07-17 01:44:23 +02:00
Andras Tim
8f3eb6dfc7 Fixed E261 flake8 errors 
at least two spaces before inline comment
 2017-07-17 01:44:22 +02:00
Ronny Pfannschmidt
0d0b01bded introduce deprecation warnings for legacy parametersets, fixes #2427 2017-06-23 22:06:49 +02:00
Ronny Pfannschmidt
23d016f114 address review comments 
* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo
 2017-06-23 11:05:38 +02:00
Ronny Pfannschmidt
1d926011a4 add deprecation warnings for using markinfo attributes 2017-06-22 15:12:50 +02:00
Ronny Pfannschmidt
19b12b22e7 store pristine marks on function.pytestmark 
fixes #2516
 2017-06-22 10:48:45 +02:00
Ronny Pfannschmidt
64ae6ae25d extract application of marks and legacy markinfos 2017-06-22 10:41:28 +02:00
Ronny Pfannschmidt
bdec2c8f9e move marker transfer to _pytest.mark 2017-06-22 08:45:10 +02:00
Bruno Oliveira
d86c89e193 Revert refactor of old-style to new-style classes 
As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398).

This reverts commit d4afa1554b from PR #2179.
 2017-05-17 18:20:51 -03:00
Ronny Pfannschmidt
ebeba79be3 remove the namespace hook from mark after the param feature merge 2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
839c936153 _pytest.mark: fix unconfigure after bad configure, still potential bug 2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
90788defb2 remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug 2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
e368fb4b29 implement pytest.param 
this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks.
 2017-03-17 16:53:43 +01:00
Bruno Oliveira
42a5d6bdfa Add __future__ imports to all pytest modules 
This prevents silly errors from creeping in Python 2 when testing in Python 3
 2017-03-16 22:45:40 -03:00
Bruno Oliveira
1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features 
# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py
 2017-03-10 15:54:05 -03:00
Ville Skyttä
ede4e9171f Spelling fixes 2017-02-15 17:00:58 +02:00