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

9246 Commits

Author SHA1 Message Date
Bruno Oliveira 5cf69fae7d
Merge pull request #4466 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-11-27 05:37:15 -02:00
Bruno Oliveira b73e083d9d Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-26 12:55:05 -02:00
Bruno Oliveira d8e00c983e
Merge pull request #4465 from nicoddemus/appveyor-retry 
[skip travis] Use retry script on AppVeyor
 2018-11-26 12:54:02 -02:00
Bruno Oliveira b00b715cb6 [skip travis] Use retry script on AppVeyor 
Fix #4387
 2018-11-26 11:35:34 -02:00
Anthony Sottile 7d3ca68be6
Merge pull request #4464 from asottile/dash_q_escaped 
Display actual test ids in `--collect-only`
 2018-11-25 11:30:26 -08:00
Anthony Sottile e9b2475e29 Display actual test ids in `--collect-only` 2018-11-25 09:33:18 -08:00
Bruno Oliveira d05b30ce11
Merge pull request #4462 from asottile/bump_pygments_pytest 
Bump pygments-pytest
 2018-11-25 00:01:06 -02:00
Anthony Sottile 2eac1bfcb8 Bump pygments-pytest 2018-11-24 17:25:53 -08:00
Bruno Oliveira 91b25c4dec
Merge pull request #4461 from asottile/fix_rtd 
Fix rtd by installing pygments-pytest
 2018-11-24 21:24:52 -02:00
Anthony Sottile d219e033e9 Fix rtd by installing pygments-pytest 2018-11-24 14:48:12 -08:00
Ronny Pfannschmidt 59f65230b5
Merge pull request #4454 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-11-24 16:34:20 +01:00
Anthony Sottile 3d8d04c6f8
Merge pull request #4456 from asottile/pygments_pytest 
Highlight docs with pygments-pytest
 2018-11-24 07:32:51 -08:00
Daniel Hahler 5bee396e4b Merge master into merge-master-into-features 2018-11-24 13:47:10 +01:00
Bruno Oliveira 8facf1db90
Merge pull request #4457 from nicoddemus/test-request-garbage 
Try to fix/improve reporting of test_request_garbage
 2018-11-24 10:08:44 -02:00
Bruno Oliveira 9e522c97fa Try to fix/improve reporting of test_request_garbage 
* Run it in a subprocess to reduce possible intereference from the outer pytest
* Print the leaked objects to see if they provide any hints
 2018-11-24 08:29:39 -02:00
Anthony Sottile 7015801377 Highlight docs with pygments-pytest 2018-11-23 22:01:30 -08:00
Anthony Sottile 860bc50772
Merge pull request #4451 from asottile/report_correct_filename_raises_exec 
Fix `raises(..., "code(string)")` frame filename.
 2018-11-23 17:29:09 -08:00
Bruno Oliveira 33b877cc01 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-23 23:27:41 -02:00
Bruno Oliveira f75f2117d0
Merge pull request #4450 from nicoddemus/release-4.0.1 
Release version 4.0.1
 2018-11-23 23:21:49 -02:00
Anthony Sottile 0d5298475d Fix `raises(..., "code(string)")` frame filename. 2018-11-23 15:01:35 -08:00
Daniel Hahler be3b8fc9c1 Fix warnings summary header appearing twice 
Ref: https://github.com/pytest-dev/pytest/pull/4450#discussion_r236017645
Ref: https://github.com/pytest-dev/pytest/pull/4399
 2018-11-23 22:47:58 +01:00
Bruno Oliveira 16b15af624 Preparing release version 4.0.1 2018-11-23 20:09:57 +00:00
Bruno Oliveira 23e4447922
Merge pull request #4399 from blueyed/summary 
Display "short test summary info" after (main) warnings again
 2018-11-23 18:06:40 -02:00
Daniel Hahler 0cf45ee18a Display "short test summary info" after (main) warnings again 
Fixes https://github.com/pytest-dev/pytest/issues/3952.
 2018-11-23 20:06:09 +01:00
Bruno Oliveira 63f90a2bcd
Merge pull request #4438 from RonnyPfannschmidt/fix-4386-raises-partial-object 
fix #4386 - restructure construction and partial state of ExceptionInfo
 2018-11-23 12:41:14 -02:00
Bruno Oliveira 0b73d6d4f5
Merge pull request #4444 from RonnyPfannschmidt/fix-4386-2 
fix #4386 - handle uninitialized exceptioninfo in repr/str
 2018-11-23 12:40:41 -02:00
Bruno Oliveira e4ae33d592
Merge pull request #4394 from blueyed/cache-ensure-files 
cacheprovider: do not write README/.gitignore to existing dir
 2018-11-23 09:07:49 -02:00
Bruno Oliveira c5c728c8bc Fix test/improve tests a bit in py27 2018-11-22 21:38:33 -02:00
Bruno Oliveira f987b368e8
Merge pull request #3776 from alysivji/attrs-n-dataclasses 
Detailed assert failure introspection for attrs and dataclasses objects
 2018-11-22 21:25:35 -02:00
Bruno Oliveira 9ae8429a21 Use a more specific exception type in test_raises_repr_inflight 
As requested during review
 2018-11-22 20:24:46 -02:00
Bruno Oliveira 2eaf3db6ae Fix docstring indentation (docs env) 2018-11-22 20:21:22 -02:00
Ronny Pfannschmidt 88bf01a31e fix #4386 - restructure construction and partial state of ExceptionInfo 2018-11-22 21:20:32 +01:00
Ronny Pfannschmidt abaf496fe8
Merge pull request #4440 from nicoddemus/config-warning-stacklevel 
Adjust stacklevel of "config" warnings
 2018-11-22 21:02:52 +01:00
Ronny Pfannschmidt b71bd9b300 fix #4386 - handle uninitialized exceptioninfo in repr/str 2018-11-22 20:52:15 +01:00
Ronny Pfannschmidt 94d032a6de
Merge pull request #4436 from asottile/print_function 
Fix formatting of print() calls
 2018-11-22 20:17:19 +01:00
Bruno Oliveira 9424d88843
Merge pull request #4427 from RonnyPfannschmidt/fix-4425 
fix 4425: resolve --basetemp to absolute paths
 2018-11-22 17:10:10 -02:00
Bruno Oliveira d471ecc4d8 Add changelog entry 2018-11-22 14:45:50 -02:00
Bruno Oliveira aa765cf8c2 Adjust stacklevel of "config" warnings 
Related to #4439
 2018-11-22 14:44:01 -02:00
Ronny Pfannschmidt 5f1d692072 use Path.resolve in test to sort out osx temporary folder being a symlink 2018-11-22 16:10:12 +01:00
Ronny Pfannschmidt 2c45bc3019
Merge pull request #4437 from asottile/consistency_errors_red 
Color the setup ERROR red
 2018-11-22 12:00:07 +01:00
Anthony Sottile 664257c7a3 Color the setup ERROR red 2018-11-22 00:20:13 -08:00
Anthony Sottile b3700f61ba Fix formatting of print() calls 2018-11-22 00:15:14 -08:00
Ronny Pfannschmidt d894bf4535
Merge pull request #4407 from blueyed/sys-dunder 
capture: do not overwrite `sys.__stdin__` etc
 2018-11-22 07:26:06 +01:00
Bruno Oliveira 3eaa6d8835
Merge pull request #4433 from 3lnc/doc_explicit_multimarker 
Adds note on multiple module marker usage
 2018-11-21 20:51:29 -02:00
Bruno Oliveira f1fe9e41ac Mention PR# in the comment for future reference 2018-11-21 20:49:17 -02:00
Bruno Oliveira 4f5c153d29 Fix call to os.path.abspath: the argument might already be a Path instance 
There's Path.absolute(), but it is not public, see https://bugs.python.org/issue25012.
 2018-11-21 20:46:08 -02:00
Slam ee4f8c98a9 Adds note on multiple module marker usage 2018-11-21 14:37:28 +02:00
Bruno Oliveira f180ab3e69 Use os.path.abspath to get absolute path instead of Path.resolve() 
Unfortunately it seems there is a difference in resolve() behavior depending
on the platform
 2018-11-20 20:08:01 -02:00
Daniel Hahler 9ed63c607e capture: do not overwrite `sys.__stdin__` etc 
Ref: https://github.com/pytest-dev/pytest/pull/4398#discussion_r234333053
 2018-11-20 16:50:15 +01:00
Ronny Pfannschmidt fc61bdd907 fix 4425: resolve --basetemp to absolute paths 2018-11-20 16:14:50 +01:00