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

6388 Commits

Author SHA1 Message Date
Ronny Pfannschmidt 377e649e61 local merge of #1967 - Change exception raised by capture.DontReadFromInput.fileno() 2016-10-24 12:47:55 +02:00
Ronny Pfannschmidt 35d154f580 Merge pull request #2011 from nicoddemus/false-rewrite-warnings 
Fix false-positive warnings from assertion rewrite hook
 2016-10-24 12:19:23 +02:00
Ronny Pfannschmidt 4e9c633185 Merge pull request #2021 from nicoddemus/doctest-modules-ci 
Re-enable docstring testing of _pytest modules on CI
 2016-10-24 12:19:05 +02:00
Florian Schulze 6ec0c3f369 Bump. 2016-10-24 12:10:49 +02:00
Florian Schulze ce138060ac Prepare pytest-warnings 0.2.0. 2016-10-24 12:09:49 +02:00
Florian Schulze f229b573fa Bump version, add changelog entry and move stuff around for added coverage reporting. 2016-10-24 12:08:21 +02:00
Florian Schulze 28621b0510 Merge pull request #2 from Carreau/filter-regex 
Add a warning option which does not escape its arguments.
 2016-10-24 11:51:15 +02:00
Matthias Bussonnier bc94a51a96 Add a warning option which does not escape its arguments. 
This is useful when to use regular expressions, like for example ignore
a bunch of dynamic messages
    --filterwarnigns 'ignore:Please use assert.* instead.:'

Or ignore all the warnings in a sub-backage
    --filterwarnigns 'ignore:::package.submodule.*'

This is also available in the ini file as the filterwarnigns options
 2016-10-22 09:58:13 -07:00
Bruno Oliveira 7f95ea31d5 Merge pull request #2024 from jaraco/issue-2022 
Restore pexpect tests on macOS. Fixes #2022.
 2016-10-21 17:17:14 -02:00
Jason R. Coombs f2c01c5407 Restore pexpect tests and bypass isalive/wait on macOS. Ref #2022. 2016-10-21 12:36:42 -04:00
Jason R. Coombs 60a347aeb5 Also use flush where wait was called unconditionally 2016-10-21 12:11:35 -04:00
Jason R. Coombs 11ec96a927 Extract child flush as a staticmethod 2016-10-21 12:10:35 -04:00
Bruno Oliveira 37dcdfbc58 Re-enable docstring testing of _pytest modules on CI 
* Fix doctests
* List one env per line in tox.ini
* "doctesting" tox env now also tests docstrings using doctest
 2016-10-21 08:55:53 -02:00
Bruno Oliveira 9d00615bbf Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2016-10-20 21:51:42 -02:00
Bruno Oliveira 2a2b8cee09 Fix false-positive warnings from assertion rewrite hook 
Fix #2005
 2016-10-20 21:40:57 -02:00
Ronny Pfannschmidt 82fb63ca2d Merge pull request #2019 from nicoddemus/fix-metavar-pair-help 
Fix cmdline help message for custom options with two or more metavars
 2016-10-21 01:36:24 +02:00
Bruno Oliveira 620b384b69 Fix cmdline help message for custom options with two or more metavars 
Fix #2004
 2016-10-20 20:34:39 -02:00
Ronny Pfannschmidt 5cbfefbba0 Merge pull request #2018 from nicoddemus/disable-py35-trial 
Disable py35-trial while #1989 is not fixed
 2016-10-20 23:18:48 +02:00
Bruno Oliveira 95007ddeca Disable py35-trial while #1989 is not fixed 2016-10-20 18:56:54 -02:00
Ronny Pfannschmidt 995e60efbf Merge pull request #2017 from nicoddemus/pytest-main-args-docs 
Remove example of obsolete pytest.main usage with string
 2016-10-20 18:29:54 +02:00
Bruno Oliveira 918af99a2a Remove example of obsolete pytest.main usage with string 2016-10-20 12:30:58 -02:00
Ronny Pfannschmidt c0719a5b4c Merge pull request #2009 from pytest-dev/RonnyPfannschmidt-patch-docs-remove-main-string 
docs: remove mention of string args to main

closes #2008
 2016-10-18 17:52:15 +02:00
Ronny Pfannschmidt afc1e2b0e1 docs: remove mention of string args to main 
fixes #2008

string args got deprecated due to the insane amount of edge-cases wrt splitting on windows vs posix
 2016-10-18 17:21:40 +02:00
Ronny Pfannschmidt de1614923f Merge pull request #2000 from nicoddemus/issue-1998 
Handle import errors with non-ascii messages when importing plugins
 2016-10-17 21:13:56 +02:00
Matthew Duck acee88a118 Fix truncation tests: pyruntest() match 
Fix issue with truncation tests for -vv and CI, where the test for
non-truncated output would return a positive match even on truncated output.
 2016-10-16 20:54:51 +01:00
Bruno Oliveira bc1f8666aa Fix link in CHANGELOG for #1853 2016-10-12 18:19:34 -03:00
Bruno Oliveira 78eec0d7f8 Handle import errors with non-ascii messages when importing plugins 
Fix #1998
 2016-10-12 18:19:32 -03:00
Matthew Duck 0061d9bd3d Fix flake8 (unused import, trailng whitespace) 2016-10-11 00:17:15 +01:00
Matthew Duck b629da424e Restructure truncation of assertion messages 
This addresses ref https://github.com/pytest-dev/pytest/issues/1954.

The current truncation for assertion explanations does not deal with long lines
properly:

- Previously if lines were too long it would display a "-n more lines"
  message.

- 999e7c6541 introduced a bug where long lines can
  cause index errors if there are < 10 lines.

Extract the truncation logic into its own file and ensure it can deal with
long lines properly.
 2016-10-10 23:38:27 +01:00
Bruno Oliveira 3301a1c173 Merge pull request #1987 from Budulianin/master 
Update fixture.rst
 2016-10-05 17:01:11 -03:00
Grigorii Eremeev 65ebc75ee8 Update fixture.rst 
Removed redundant word
 2016-10-05 22:26:13 +03:00
Bruno Oliveira cf13355d3f Merge pull request #1979 from nicoddemus/show-traceback-during-collection 
Show traceback during collection
 2016-10-05 16:18:43 -03:00
Florian Bruhin 1289cbb9a5 Merge pull request #1988 from nicoddemus/pr-template-small-fixes 
Mention small doc fixes don't need tests/changelog entries in PR template
 2016-10-05 21:10:36 +02:00
Bruno Oliveira 10433db225 Mention small doc fixes don't need tests/changelog entries in PR template 2016-10-05 15:36:38 -03:00
Bruno Oliveira 50b960c1f0 Add note about not monkey-patching builtins (#1986) 
* Add note about not monkey-patching builtins

Related to #1985

* Mention -s as well
 2016-10-05 17:57:40 +02:00
Bruno Oliveira d47ae799a7 Merge pull request #1983 from pytest-dev/fix-1981-improve-ini-options-help-text 
Fix #1981, improve ini-options help text
 2016-10-04 12:43:42 -03:00
Tom V c93a9e3361 Fix #1981, improve ini-options help text 2016-10-04 14:41:09 +01:00
Bruno Oliveira a1d446b8e8 Display traceback from Import errors using pytest's short representation 
Also omit pytest's own modules and internal libraries (py and pluggy) in low verbosity

Fix #1976
 2016-10-03 21:46:44 -03:00
Bruno Oliveira 7d66e4eae1 Display full traceback from Import errors when collecting test modules 
Fix #1976
 2016-10-03 20:47:44 -03:00
Bruno Oliveira fc02003220 Merge pull request #1975 from nicoddemus/pytest-skip-message 
Pytest skip message
 2016-10-01 14:44:49 -03:00
Bruno Oliveira 336d7900c5 Fix test about pytest.skip message being used at global level 
Fix #1959
 2016-10-01 13:38:52 -03:00
Nikolaus Rath 57bb3c6922 Improve error message when using pytest.skip at module level 
As discussed in issue #1959.
 2016-10-01 13:38:52 -03:00
Bruno Oliveira 4667b4decc Merge branch 'master' into features 2016-09-29 19:03:26 -03:00
Bruno Oliveira a87b1c79c1 post 3.0.3 release changes 2016-09-29 18:58:17 -03:00
Bruno Oliveira 30f3d95aeb Merge pull request #1973 from nicoddemus/release-3.0.3 
Release 3.0.3
 2016-09-29 18:54:50 -03:00
Bruno Oliveira ba6ecc14c8 Include release-3.0.3 into the announce toctree 2016-09-28 17:16:57 -04:00
Bruno Oliveira 41d3b3f4f9 Regendoc for version 3.0.3 2016-09-28 16:36:15 -04:00
Bruno Oliveira dda17994ec Prepare for 3.0.3 release 2016-09-28 16:33:38 -04:00
Skylar Downes b0c78c867d Update CHANGELOG.rst 2016-09-27 15:50:45 -07:00
Skylar Downes 3d211da9bd add existing test suite page to table of contents 2016-09-27 14:01:54 -07:00