feuillemorte
936651702b
#1642 Fix tests
2018-02-01 00:27:48 +03:00
feuillemorte
9f1772e679
#1642 Resolve conflicts
2018-02-01 00:18:28 +03:00
feuillemorte
741b571f3b
#1642 fix tests and config.py
2018-02-01 00:03:24 +03:00
Bruno Oliveira
f2fb841b29
Merge remote-tracking branch 'upstream/master' into features
2018-01-30 20:12:14 -02:00
Bruno Oliveira
3256fa9ee9
Add devpi-client to tasks requirements
2018-01-30 20:10:40 -02:00
Bruno Oliveira
dc9a9ec4c2
Merge pull request #3162 from nicoddemus/release-3.4.0
...
Release 3.4.0
2018-01-30 20:08:36 -02:00
Bruno Oliveira
527845ef29
Changelog adjustments suggested during review
2018-01-30 19:49:08 +00:00
Bruno Oliveira
489e638b4e
Preparing release version 3.4.0
2018-01-30 19:47:56 +00:00
Bruno Oliveira
13ee1cffed
Suggest to update all dependencies when preparing releases
2018-01-30 19:44:06 +00:00
Bruno Oliveira
4c148bd0ef
Fix imports in failure_demo.py
2018-01-30 19:44:06 +00:00
Bruno Oliveira
71a7b3c062
Merge pull request #3142 from thisch/only_colorize_levelname
...
Colorize live-log levelnames
2018-01-30 17:41:18 -02:00
Thomas Hisch
ebab1b6c69
live-logging: Colorize levelname
2018-01-30 18:21:12 +01:00
Bruno Oliveira
49773b573f
Merge pull request #3132 from raphaelcastaneda/feature/add-record-xml-attribute
...
implement #3130 - add record_xml_attribute fixture
2018-01-29 15:42:55 -02:00
Ronny Pfannschmidt
32979def7d
Merge pull request #3158 from nicoddemus/cache-getvalue
...
Replace deprecated option.getvalue by option.getoption in cache plugin
2018-01-29 13:57:45 +01:00
Bruno Oliveira
ab00c3e911
Add .pytest_cache directory to gitignore
2018-01-29 08:44:11 -02:00
Bruno Oliveira
6e4efccc38
Rename test_cache to test_cacheprovider for consistency with cacheprovider
2018-01-29 08:40:29 -02:00
Bruno Oliveira
269eeec702
Replace deprecated option.getvalue by option.getoption in cacheprovider
2018-01-29 08:40:29 -02:00
Bruno Oliveira
0e1be01b7a
Merge pull request #3108 from cheezman34/features
...
Optimize reorder_items in fixtures.py
2018-01-27 23:21:09 -02:00
Bruno Oliveira
aff463a3c4
Merge remote-tracking branch 'upstream/master' into features
2018-01-27 12:28:43 -02:00
Bruno Oliveira
b3247c1d03
Merge pull request #3044 from RonnyPfannschmidt/parameterset-empty-enable-xfail
...
empty parameterset - enable opt to xfail
2018-01-27 12:23:49 -02:00
Bruno Oliveira
169635e889
Move example of empty_parameter_set_mark closer to the options
2018-01-27 11:02:32 -02:00
Bruno Oliveira
cd0b2ace67
Merge pull request #3150 from alanbato/pytest_cache
...
Change cache directory structure to include `pytest`
2018-01-27 10:08:56 -02:00
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
77de45cce3
enhance docs for empty_parameter_set_mark according to review comments
2018-01-26 12:01:27 +01:00
Ronny Pfannschmidt
d550c33cd0
s/empty_parameterset/empty_parameter_set_mark
2018-01-26 11:56:24 +01:00
Bruno Oliveira
a58099022a
Merge pull request #3124 from nicoddemus/logging-3013
...
Changes in the logging plugin for 3.4
2018-01-26 08:52:43 -02:00
Ronny Pfannschmidt
3bc7ced97a
Merge pull request #3153 from brianmaissy/document_not_to_call_main_multiple_times
...
Added note that calling pytest.main multiple times from the same process is not recommended because of import caching
2018-01-26 11:47:16 +01:00
Ronny Pfannschmidt
8979b2a9d7
document empty_parameterset in customize.rst
2018-01-26 11:26:48 +01:00
Ronny Pfannschmidt
d4c11e58aa
exted empty parameterset check with reason test
2018-01-26 11:18:50 +01:00
Ronny Pfannschmidt
7f83605c81
fix empty parameterset tests by mocking a config object
2018-01-26 11:10:00 +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
Brian Maissy
4285325cb8
Added note that calling pytest.main multiple times from the same process is not recommended because of import caching
2018-01-25 23:07:34 +02:00
Bruno Oliveira
cbbd606b6c
Reword changelog
2018-01-25 17:21:54 -02:00
feuillemorte
ace772c743
Merge branch '1642-add-rootdir-option' of github.com:feuillemorte/pytest into 1642-add-rootdir-option
2018-01-25 19:46:43 +03:00
feuillemorte
3a004a4507
added rootdir description to customize.rst
2018-01-25 19:46:22 +03:00
Alan Velasco
a24ca9872f
Change cache directory name to include `pytest`
2018-01-25 07:50:08 -06:00
feuillemorte
503e00f7ff
#1642 Remove adding rootdir to sys path
2018-01-25 15:57:29 +03:00
feuillemorte
0cfa975930
#1642 Fix tests
2018-01-25 15:57:04 +03:00
Bruno Oliveira
b8be339632
Merge pull request #3148 from nicoddemus/deprecate-old-style-classes-2147
...
All classes now subclass object for better py3 compatibility
2018-01-25 10:41:28 -02:00
Bruno Oliveira
2aad8c0fce
Merge pull request #3147 from nicoddemus/issue-3103
...
'-o' option no longer swallows all other non-options after it
2018-01-25 10:41:18 -02:00
Bruno Oliveira
15cbd61159
Change caplog.get_handler(when) to caplog.get_records(when)
...
While updating the docs I noticed that caplog.get_handler() exposes
the underlying Handler object, which I think it is a bit too much
detail at this stage. Update to return the records directly instead.
2018-01-24 19:08:49 -02:00
Bruno Oliveira
2f955e0c99
Update documentation: rewording and move things for better reading flow
2018-01-24 18:42:59 -02:00
Bruno Oliveira
af37778b0d
All classes now subclass object for better py3 compatibility
...
Fix #2147
2018-01-24 18:23:42 -02:00
Bruno Oliveira
3f5e9ea71e
Fix -o behavior to no longer swallow all remaining options
...
The current behavior was too error-prone because a "-o" option would
swallow all the following non-option parameters:
pytest -o foo=bar path/to/test.py
path/to/test.py would be captured by the -o option, and would fail
because "path/to/test.py" is not in the format "key=value".
2018-01-23 21:19:16 -02:00
Bruno Oliveira
443275f025
Reword changelog a bit
2018-01-23 21:19:04 -02:00
Bruno Oliveira
8426c57a9e
Ensure changes in the message in the future do not make the test pass by accident
2018-01-23 21:18:59 -02:00
Aron Coyle
30ca9f9d38
Add endline
2018-01-23 21:18:51 -02:00
Aron Coyle
46d87deb5d
Add changelog update authors
2018-01-23 21:18:45 -02:00