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

5464 Commits

Author SHA1 Message Date
Bruno Oliveira 1fb09d9dd5 Merge pull request #1726 from nicoddemus/warnings-displayed-by-default 
Warnings displayed by default
 2016-07-13 19:33:49 -03:00
Bruno Oliveira 1266ebec83 Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default 
# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py
 2016-07-13 18:45:15 -03:00
Bruno Oliveira 6e9ee2b766 Merge pull request #1724 from blueyed/followup-pr1718-remove-newline 
funcarg_prefix_warning: remove newline
 2016-07-13 15:46:16 -03:00
Daniel Hahler 3cfebdd7c5 funcarg_prefix_warning: remove newline 
Followup to https://github.com/pytest-dev/pytest/pull/1718.
 2016-07-13 18:33:24 +02:00
Bruno Oliveira dd5ce96cd7 Merge pull request #1718 from blueyed/fix-funcarg_prefix_warning 
Add punctuation to funcarg_prefix_warning
 2016-07-13 12:53:54 -03:00
Florian Bruhin aeccd6b4a2 Merge pull request #1720 from nicoddemus/changelog-formatting 
Improve overall CHANGELOG formatting and consistency for 3.0
 2016-07-13 15:58:38 +02:00
Bruno Oliveira 4a763accc5 Improve overall CHANGELOG formatting and consistency for 3.0 2016-07-13 08:52:36 -03:00
Florian Bruhin 54ea27c283 Merge pull request #1719 from nicoddemus/fix-2.10-versions-in-docs 
Fix 2.10 -> 3.0 versions in docs
 2016-07-13 08:10:13 +02:00
Bruno Oliveira f827810fa8 Fix 2.10 -> 3.0 versions in docs 2016-07-12 21:02:40 -03:00
Daniel Hahler 15e97a7c78 Add punctuation to funcarg_prefix_warning 2016-07-12 23:49:09 +02:00
Ronny Pfannschmidt c4f20a1834 Merge pull request #1712 from anntzer/custom-debugger 
Allow passing a custom Pdb subclass via --pdbcls.
 2016-07-12 16:45:07 +02:00
Ronny Pfannschmidt 4c56c95eb8 Merge pull request #1714 from nicoddemus/deprecate-yield-tests-funcarg-prefix 
Deprecate yield tests funcarg prefix
 2016-07-12 11:43:59 +02:00
Antony Lee 7ee3dd1cb5 Add tests for custom pdb class. 
(and edit CHANGELOG)
 2016-07-11 20:07:29 -07:00
Bruno Oliveira 458ecae1df Replace all usages of "pytest_funcarg__" for @pytest.fixture 2016-07-11 22:21:52 -03:00
Bruno Oliveira ad4125dc0d Deprecate "pytest_funcarg__" prefix to declare fixtures 
Fixes #1684
 2016-07-11 22:21:50 -03:00
Bruno Oliveira 5506dc700c Deprecate yield tests 
Closes #16
Closes #1324
 2016-07-11 22:21:49 -03:00
Bruno Oliveira 6f68dfcc47 Merge pull request #1710 from RonnyPfannschmidt/fixture-split 
Fixture split 2nd attempt
 2016-07-10 12:10:07 -03:00
Antony Lee 6383b53ad9 Allow passing a custom Pdb subclass via --pdbcls. 
This obviates the need for plugins such as `pytest-ipdb`; instead one
can simply call `py.test --pdb=IPython.core.debugger:Pdb`
 2016-07-09 21:10:52 -07:00
Ronny Pfannschmidt 8c49561470 split most fixture related code into own plugin 2016-07-09 20:36:00 +02:00
Florian Bruhin 7a2058e3db Merge pull request #1709 from The-Compiler/changelog 
Clean up changelog
 2016-07-08 18:52:28 +02:00
Florian Bruhin 668ebb102c Clean up changelog 
- Merged 3.0 and 2.10 as much stuff from the sprint went to the 2.10
  section.
- Cleaned up mixture of link/text blocks
- Moved some entries to "Bug Fixes" and "Incompatible changes"
- Stop doing "Fixes (#123) ..." because it looks weird
- Add some new empty points for all sections
 2016-07-08 18:51:26 +02:00
Bruno Oliveira 293351cfd0 Merge pull request #1705 from RonnyPfannschmidt/merge-master 
Merge from master to features
 2016-07-08 08:15:54 -03:00
Ronny Pfannschmidt dad6aa8a16 fix duplicate target in changelog 2016-07-06 13:51:13 +02:00
Ronny Pfannschmidt b9a91dc112 merge from master to features 2016-07-06 11:51:48 +02:00
Bruno Oliveira f31c31a73c Merge pull request #1695 from sallner/feature-setup-show 
Feature setup show
 2016-07-05 21:29:01 -03:00
aostr 94e4a2dd67 * implemented changes recommended by nicoddemus 2016-07-05 15:22:27 +02:00
Ronny Pfannschmidt cc0920ceb1 Merge pull request #1699 from nicoddemus/404-links-on-talks-docs 
Fix links and removed 404 links from talks.rst
 2016-07-05 08:44:23 +02:00
Florian Bruhin 067e044f97 Merge pull request #1700 from nicoddemus/split-appveyor 
Split AppVeyor test runs in multiple jobs to avoid timeout issues
 2016-07-05 06:43:39 +02:00
Bruno Oliveira 10c5e6fd9c Split AppVeyor test runs in multiple jobs to avoid timeout issues 
Some of our builds have been timing out (over 1 hour),
on AppVeyor
 2016-07-04 21:54:21 -03:00
Bruno Oliveira 8d39ce17da Fix links and removed 404 links from talks.rst 
Fix #1696
 2016-07-04 21:32:57 -03:00
Steffen Allner 6438895a23 Fix PEP-8. 2016-07-03 22:33:21 +02:00
Steffen Allner b650c3c118 Implement --setup-show cli flag 
to also be able to see fixture setup with normal test execution.
 2016-07-03 22:30:51 +02:00
Steffen Allner f7b5bb2f97 Merged branch features into features 2016-07-03 21:07:02 +02:00
Bruno Oliveira f74dd8550f Merge pull request #1692 from pytest-dev/changelog 
Add changelog to requirements for pytest-dev plugins
 2016-06-30 17:39:14 -03:00
Florian Bruhin e3c43a1462 Add changelog to requirements for pytest-dev plugins 
Closes #1691
 2016-06-30 22:25:09 +02:00
Florian Bruhin 7927dff8a1 Merge pull request #1678 from RonnyPfannschmidt/drop-python30-32 
drop python 3.0-3.2 support code from setup.py
 2016-06-30 11:15:49 +02:00
Ronny Pfannschmidt 1451a1ab00 remove unsupported python versions from code/source xfail 2016-06-30 10:03:40 +02:00
Bruno Oliveira 75ecd94294 Merge pull request #1689 from quodlibetor/autouse-docs 
Document the interaction of autouse scopes
 2016-06-29 18:08:06 -03:00
Brandon W Maister 771c4539fa Document the interaction of autouse scopes 
I wouldn't have even attempted what I did to cause #1688 if this had
been there.
 2016-06-29 16:52:13 -04:00
Ronny Pfannschmidt 2a43237527 docs: no longer include python 3.0-3.2 in the index page 2016-06-27 18:20:56 +02:00
Ronny Pfannschmidt 7dc8d1ab60 fix typo and remove python3.2 from readme 2016-06-27 18:19:00 +02:00
Florian Bruhin 1e60294188 Merge pull request #1679 from eli-b/patch-1 
catched -> caught
 2016-06-27 18:02:16 +02:00
Ronny Pfannschmidt e877e25587 drop python 3.0-3.2 support code from setup.py 
addresses #1627
 2016-06-27 17:55:37 +02:00
Eli Boyarski 21d27784eb catched -> caught 
Even though catch is a Python keyword, 'catched' just looks terrible in text.
If the text was supposed to reference the keyword, then 'catched' should be changed to "'catch'ed".
 2016-06-27 15:41:40 +03:00
Bruno Oliveira ccd395ffe0 Merge pull request #1659 from RonnyPfannschmidt/failtest-586 
xfailing test for #568
 2016-06-27 07:38:14 -03:00
Ronny Pfannschmidt 76756c0c0b mark tests: use better name of the test for #568 2016-06-27 11:57:21 +02:00
Bruno Oliveira 44695ae46c Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs 2016-06-26 23:44:07 +02:00
Bruno Oliveira 7e78965c79 Merge branch 'logic_brackets' 2016-06-26 21:34:37 +02:00
Bruno Oliveira 58e558141d Remove commented out code 2016-06-26 21:19:07 +02:00
Bruno Oliveira 22c2d87633 Fix bad merge in CHANGELOG 2016-06-26 21:18:01 +02:00