jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,366 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

7366 Commits

Author SHA1 Message Date
Jordan Speicher 774c539f1a Add --deselect command line option 
Fixes #3198
 2018-02-16 08:17:37 -06:00
Bruno Oliveira 063e2da967
Merge pull request #3176 from feuillemorte/1478_no_stdout_option 
#1478 Added --no-stdout option
 2018-02-09 18:36:36 -02:00
feuillemorte da5882c2d5 #1478 Add doc and remove print 2018-02-09 21:36:48 +03:00
Bruno Oliveira bba258aa5e
Merge pull request #3190 from s0undt3ch/feature/logs-stream 
Expose `log_cli` as a CLI parser option.
 2018-02-08 17:07:48 -02:00
Bruno Oliveira a4cbd03535 Fix linting 2018-02-08 13:22:32 -02:00
feuillemorte 71367881ed #1478 Added --show-capture=both option (fix comments) 2018-02-08 16:21:22 +03:00
Bruno Oliveira ad7d63df97 Rename _stream_logs_enabled to _log_cli_enabled and remove _stream_logs 2018-02-08 09:48:51 -02:00
Pedro Algarvio 0b71255dda
Expose `log_cli` as a CLI parser option. 2018-02-08 09:42:53 +00:00
Bruno Oliveira ce0a9aadec
Merge pull request #3127 from feuillemorte/1642-add-rootdir-option 
#1642 add rootdir option
 2018-02-07 18:18:59 -02:00
Bruno Oliveira ed12cf3fb3
Merge pull request #3189 from s0undt3ch/feature/logstart-logfinish 
Additionally handle logstart and logfinish hooks
 2018-02-07 18:09:45 -02:00
Bruno Oliveira 29a074eae3
Merge pull request #3156 from thisch/junit_xml_log_fix 
Add captured log msgs to junit xml file
 2018-02-06 21:42:11 -02:00
feuillemorte 1a650a9eb9 #1478 Added --show-capture option 2018-02-06 23:38:51 +03:00
Bruno Oliveira ea06c1345f
Update changelog wording slightly 2018-02-06 15:45:37 +00:00
Pedro Algarvio 00d8787bb8
Add name to AUTHORS 2018-02-06 15:45:37 +00:00
Pedro Algarvio 67558e0e22
Additionally handle logstart and logfinish hooks 2018-02-06 15:45:36 +00:00
Bruno Oliveira 2d0c1e941e
Fix versionadded tag in caplog function 2018-02-05 20:22:21 -02:00
Thomas Hisch c0ef4a4d35 Add captured log msgs to junit xml file 
For each test this adds the captured log msgs to a system-* tag in the junit
xml output file. The destination of the system-* tag is specified by
junit_logging ini option.
 2018-02-03 09:39:29 +01:00
Bruno Oliveira 37d836d754
Reword docs slightly 2018-02-01 19:34:15 -02:00
feuillemorte 3eb6cad222 #1642 Fix comments 2018-02-01 11:20:37 +03:00
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
feuillemorte 949a620d3a #1478 Added --no-stdout option 2018-01-31 22:36:28 +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