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

7943 Commits

Author SHA1 Message Date
Bruno Oliveira f3c87a77a7 Merge remote-tracking branch 'upstream/master' into release-3.5.0 2018-03-21 20:39:44 +00:00
Bruno Oliveira 6f95189cf7
Merge pull request #3306 from nicoddemus/2405-scope-fixture-order 
Instantiate fixtures by scope order in test function requests
 2018-03-21 17:37:05 -03:00
Ronny Pfannschmidt add5ce0fb8
Merge pull request #3230 from brianmaissy/features 
deprecate pytest_plugins in non-top-level conftest
 2018-03-21 07:44:34 +01:00
Bruno Oliveira 59e7fd478e Sort fixtures by scope when determining fixture closure 
Fix #2405
 2018-03-20 20:10:53 -03:00
Bruno Oliveira 9e24b09a9f Use re_match_lines in test_class_ordering 
"[1-a]" works fine using fnmatch_lines, but "[a-1]" breaks horribly
inside `re`.
 2018-03-20 20:10:52 -03:00
Bruno Oliveira d03e38941b
Merge pull request #3295 from brianmaissy/feature/last-failed-no-failures-behavior 
implemented --last-failed-no-failures
 2018-03-20 19:17:25 -03:00
Bruno Oliveira 672239b149
Merge pull request #3321 from jeffreyrack/'test_from_base_fix' 
3245: Fix tests to not fail when running from base directory
 2018-03-20 18:45:56 -03:00
Jeffrey Rackauckas 9b449eee15 Add self to authors 2018-03-18 21:28:20 -07:00
Jeffrey Rackauckas c1d73bb535 Modifying changelog to reflect new changes for 3245 2018-03-18 21:27:48 -07:00
Jeffrey Rackauckas a4cf380343 Fix tests to not fail when running from root. 2018-03-18 21:23:39 -07:00
Ronny Pfannschmidt f61d0525a5
Merge pull request #3318 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-03-17 09:40:32 +01:00
Kale Kundert 86d6804e60
Merge pull request #3313 from tadeu/approx-array-scalar 
Add support for `pytest.approx` comparisons between array and scalar
 2018-03-16 23:29:46 -07:00
Bruno Oliveira 1fff81e21d Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-03-16 18:15:28 -03:00
Bruno Oliveira 93847bfeb4
Merge pull request #3315 from pytest-dev/issue/3314 
Allow DontReadFromInput to produce iterator without error.
 2018-03-16 10:05:54 -03:00
Tadeu Manoel a754f00ae7 Improve `numpy.approx` array-scalar comparisons 
So that `self.expected` in ApproxNumpy is always a numpy array.
 2018-03-16 09:01:18 -03:00
Bruno Oliveira 278d8ac74e Fix caplog docstring: indentation caused errors during docs build 2018-03-16 00:06:15 -03:00
Bruno Oliveira 17468fc99c Fix caplog docstring: indentation caused errors during docs build 2018-03-16 00:04:28 -03:00
Jason R. Coombs b66019202e Fix test failure on Python 2. Ref #3314. 2018-03-15 21:33:58 -04:00
Jason R. Coombs 965a030564 Add changelog. Ref #3314. 2018-03-15 21:31:12 -04:00
Jason R. Coombs 2f47624b19 Allow DontReadFromInput to produce iterator without error. Fixes #3314. 2018-03-15 21:26:40 -04:00
Jason R. Coombs 3c3fc3bb9d Add test capturing new expectation. Ref #3314. 2018-03-15 21:25:50 -04:00
Tadeu Manoel 42c84f4f30 Add fixes to `numpy.approx` array-scalar comparisons (from PR suggestions) 2018-03-15 13:41:58 -03:00
Bruno Oliveira fbcf1a90c9
Merge pull request #3193 from pytest-dev/ref-docs 
Reference docs
 2018-03-15 12:04:34 -03:00
Tadeu Manoel 97f9a8bfdf Add fixes to make `numpy.approx` array-scalar comparisons work with older numpy versions 2018-03-14 17:10:35 -03:00
Tadeu Manoel 161d4e5fe4 Add support for pytest.approx comparisons between scalar and array (inverted order) 2018-03-14 16:29:04 -03:00
Tadeu Manoel c34dde7a3f Add support for pytest.approx comparisons between array and scalar 2018-03-14 15:47:21 -03:00
Ronny Pfannschmidt 1b535387bf
Merge pull request #3309 from tareqalayan/issue-3308 
issue #3308: fix example in documentation
 2018-03-14 15:52:55 +01:00
Tareq Alayan 7e53f9432c issue #3308: fix example in documentation 
https://github.com/pytest-dev/pytest/issues/3308
 2018-03-14 15:44:43 +02:00
Ronny Pfannschmidt b2b629f462
Merge pull request #3305 from nicoddemus/2370-tmpfile-close-py27 
Suppress ``IOError`` when closing the temporary file used for capturing streams in Python 2.7
 2018-03-14 06:42:06 +01:00
Bruno Oliveira cbb2c55dea
Merge pull request #3304 from RonnyPfannschmidt/cmdoptions-removal 
remove CmdOptions since we can use argparse.Namespace()
 2018-03-13 17:48:21 -03:00
Bruno Oliveira 9517c3a2aa Suppress ``IOError`` when closing the temporary file used for capturing streams in Python 2.7. 
Fix #2370
 2018-03-13 17:41:42 -03:00
Bruno Oliveira 4175ed8b43
Merge pull request #3296 from RonnyPfannschmidt/verbosity-actions 
unify cli verbosity handling
 2018-03-13 17:38:41 -03:00
Ronny Pfannschmidt 87f2003245 remove CmdOptions since we can use argparse.Namespace() 2018-03-13 18:13:56 +01:00
Ronny Pfannschmidt 2612d967f8
Merge pull request #3301 from ankostis/caplog_clear_text 
Fix #3297 where caplog.clear() did not clear text, just records
 2018-03-13 16:39:53 +01:00
Ronny Pfannschmidt 37a52607c2 unify cli verbosity handling 
based on https://github.com/pytest-dev/pytest/issues/3294#issuecomment-372190084

we really shouldnt have N options we post mortem hack together to determine verbosity
this change starts by unifying the data, we still need to handle deprecation/removal of config.quiet
 2018-03-13 07:05:22 +01:00
Bruno Oliveira 51c0256cd4 Remove :py:mod: ref from changelog: fails our linting check 2018-03-12 20:57:51 -03:00
Bruno Oliveira f8791c9246
Merge pull request #3292 from RonnyPfannschmidt/exception-attrs 
internal refactor port exc FOrmattedExcinfo to attrs, remove old code
 2018-03-12 20:54:52 -03:00
Kostis Anagnostopoulos 02bec7a3bb Add changelog & myself (ankostis) to authors 2018-03-13 01:46:44 +02:00
Bruno Oliveira 4459aa3d8b Remove redundant "# content of pytest.ini" headers from examples 2018-03-12 20:09:31 -03:00
Bruno Oliveira 2e347643a3 Add ini options for logging 2018-03-12 20:09:05 -03:00
Bruno Oliveira 8629ef6a78 Add missing ini options: markers, usefixtures and xfail_strict 2018-03-12 19:43:31 -03:00
Thomas Hisch 5e92644f94 Properly reset LogCaptureHandler in caplog 
Closes #3297
 2018-03-13 00:36:51 +02:00
Bruno Oliveira 3198596f8a Sort ini options 2018-03-12 19:33:34 -03:00
Kostis Anagnostopoulos 68375513f3 Add TC to demonstrate #3297 that caplog.clear() does not clean text 2018-03-13 00:28:47 +02:00
Bruno Oliveira 61b8ea8656 Add doctest_encoding and junit_suite_name ini options 2018-03-12 19:27:17 -03:00
Bruno Oliveira 0557ab431f
Merge pull request #3291 from RonnyPfannschmidt/small-moves 
move some code and make nodeid computed early
 2018-03-12 18:49:13 -03:00
Bruno Oliveira 8035f6cced Fix typo in docs 2018-03-12 18:32:51 -03:00
Bruno Oliveira 0302622310
Improve CHANGELOG entry a bit 2018-03-12 18:22:12 -03:00
Bruno Oliveira 3909225bf9
Merge pull request #3300 from JulienPalard/typo 
Typo in example, os.getcwd does not take any parameter.
 2018-03-12 12:16:18 -03:00
Julien Palard e71d907d34 Typo in example, os.getcwd does not take any parameter. 2018-03-12 15:19:26 +01:00