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

7932 Commits

Author SHA1 Message Date
Ronny Pfannschmidt 6e62fc98ff
Merge pull request #2849 from ApaDoctor/disable-repeated-fixture 
provide error fixture applied to the same func
 2018-04-24 06:36:54 +02:00
Bruno Oliveira 132fb61eba Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture 2018-04-23 22:24:53 -03:00
Bruno Oliveira 03850cf962 Add test for applying fixture twice 
Fix #2334
 2018-04-23 22:17:46 -03:00
Bruno Oliveira f05230c679
Move #3221 to trivial section in the CHANGELOG 2018-04-23 19:27:07 -03:00
Bruno Oliveira d61a7670a1
Merge pull request #3422 from rachel1792/master 
updated doc to delete deprecated hook: Issue #3417
 2018-04-23 19:24:52 -03:00
Bruno Oliveira 8d56641590 Preparing release version 3.5.1 2018-04-23 22:24:21 +00:00
Bruno Oliveira 2a480c59ae
Merge pull request #3367 from brianmaissy/feature/indicative_error_for_parametrize_with_default_argument 
added indicative error when parametrizing an argument with a default …
 2018-04-23 11:04:36 -03:00
Rachel Kogan 6ea4c12da7 updated doc to delete deprecated hook 2018-04-22 21:56:18 -04:00
Bruno Oliveira f0084608cc
Merge pull request #3407 from rachel1792/master 
Fix typo in caplog fixture documentation: Issue #3406
 2018-04-20 17:41:04 -03:00
Bruno Oliveira cefeba33ef
Update changelog formatting 2018-04-20 17:40:19 -03:00
Bruno Oliveira 3318e53d01
Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch 
#3290 improve monkeypatch
 2018-04-19 17:05:52 -03:00
Ronny Pfannschmidt 1cc79ffc10
Merge pull request #3408 from MarSoft/patch-2 
Fix typo in the comment
 2018-04-19 09:21:11 +02:00
Семён Марьясин d8015764e6
Fix typo in the comment 2018-04-18 12:47:52 +03:00
Rachel Kogan 48c99f62e3 add changelog 2018-04-17 16:24:32 -04:00
Rachel Kogan 8ff8a82c51 Merge branch 'master' of github.com:pytest-dev/pytest 2018-04-17 16:21:04 -04:00
Rachel Kogan bb8984f5ed fix error in caplog docs. 2018-04-17 16:17:29 -04:00
Bruno Oliveira 159cd39777
Merge pull request #3401 from kohr-h/underscore_fixtures 
Mention omission of fixtures with leading '_', closes #3398
 2018-04-16 13:25:10 -03:00
Brian Maissy 857098fe0f added indicative error when parametrizing an argument with a default value 2018-04-15 20:52:57 +03:00
feuillemorte 283ac8bbf4 #3290 Fix doc 2018-04-14 21:06:58 +03:00
Holger Kohr 6626d2aef9 Mention omission of fixtures with leading '_', closes #3398 2018-04-14 11:04:00 +02:00
feuillemorte ba7cad3962 #3290 Fix comments 2018-04-13 16:00:07 +03:00
Ronny Pfannschmidt 36f6687b70
Merge pull request #3397 from darrenburns/patch-2 
Fix some mistakes in contributing.rst
 2018-04-13 13:20:31 +02:00
Darren Burns 86def48b25
Fix some mistakes in contributing.rst 2018-04-13 11:33:58 +01:00
Bruno Oliveira 0024b71f1c
Merge pull request #3395 from darrenburns/patch-1 
Update CONTRIBUTING.rst
 2018-04-12 18:42:33 -03:00
Ronny Pfannschmidt 17a43dc4a5
firther enhance the links in contributing.rst 2018-04-12 22:06:06 +02:00
Darren Burns 958f146125
Update CONTRIBUTING.rst 
Fixes a broken link in CONTRIBUTING.rst
 2018-04-12 20:54:32 +01:00
Ronny Pfannschmidt 13a6f63cd9
Merge pull request #3390 from nicoddemus/atomic-pyc-writes 
Attempt to solve race-condition which corrupts .pyc files on Windows
 2018-04-12 13:57:39 +02:00
Bruno Oliveira aa95a425d7 Attempt to solve race-condition which corrupts .pyc files on Windows 
This uses of the `atomicwrites` library.

This is very hard to create a reliable test for.

Fix #3008
 2018-04-12 08:19:28 -03:00
Bruno Oliveira 015626ce69
Merge pull request #3384 from nicoddemus/leak-frame 
Reset reference to failed test frame before each test executes
 2018-04-12 07:53:34 -03:00
Ronny Pfannschmidt f9a908abb8
Merge pull request #3388 from nicoddemus/simplify-tox 
Simplify tox to avoid repetition
 2018-04-12 11:32:48 +02:00
Ronny Pfannschmidt 160c309371
Merge pull request #3391 from nicoddemus/project-urls 
Add additional project urls to setup.py
 2018-04-12 08:54:12 +02:00
Ronny Pfannschmidt f79b0324fe
Merge pull request #3387 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-04-12 08:39:22 +02:00
Bruno Oliveira 37ee4fbc48 Add additional project urls to setup.py 
According to:

https://packaging.python.org/tutorials/distributing-packages/#project-urls

Those URLs are displayed in the project page in Warehouse (new PyPI).
 2018-04-11 23:46:17 -03:00
Bruno Oliveira 888fcbc4b4 Simplify tox to avoid repetition 
Also took the opportunity to:

* Use more cores for py*-xdist environments
* Update freeze test to use py36
 2018-04-11 18:30:15 -03:00
Bruno Oliveira 10a7160549 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-04-11 18:07:47 -03:00
feuillemorte a4daac7eb0 #3290 Fix doc 2018-04-11 12:46:02 +03:00
feuillemorte 97be076f29 #3290 Added changelog file 2018-04-11 12:45:46 +03:00
feuillemorte 3d60f955f0 #3290 Added test 2018-04-11 12:45:37 +03:00
feuillemorte 659c044372 #3290 Improved monkeypatch to support some form of with statement 2018-04-11 12:45:26 +03:00
Bruno Oliveira 6e8e3c967a Add changelog entry for #2798 2018-04-10 21:09:57 -03:00
Bruno Oliveira 78c900448e Add acceptance test for #2798 2018-04-10 21:04:30 -03:00
Ronny Pfannschmidt 372bcdba0c
Merge pull request #3380 from nicoddemus/marks-fixes 
Add the list of issues fixed by the new marker implementation to the docs
 2018-04-10 14:33:58 +02:00
Bruno Oliveira d1ba19acad Add the list of issues fixed by the new marker implementation to the docs 
This will help make users more understanding if their code breaks under the
new implementation.
 2018-04-10 08:00:32 -03:00
Ronny Pfannschmidt 2241c98b18
Merge pull request #3331 from tonybaloney/breakpoint_support 
Support for the new builtin breakpoint function in Python 3.7
 2018-04-10 07:15:29 +02:00
Bruno Oliveira 715337011b
Merge pull request #3317 from RonnyPfannschmidt/marker-pristine-node-storage 
introduce a distinct searchable non-broken storage for markers
 2018-04-09 19:40:12 -03:00
Bruno Oliveira e012dbe346
Merge pull request #3373 from backbord/master 
Fix issue #3372
 2018-04-06 22:10:57 -03:00
Tim Strazny 5bd8561016 linting: unfortunate dedent be gone. 2018-04-06 17:36:35 +02:00
Tim Strazny 846d91fb95 Follow Ronny's advice and use ``type`` in ``base_type``. 2018-04-06 16:23:04 +02:00
Tim Strazny 0cd74dc324 Ensure object is class before calling issubclass. 2018-04-06 14:40:30 +02:00
Tim Strazny ec2d8223cf Fix issue #3372 2018-04-06 14:16:12 +02:00