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

5677 Commits

Author SHA1 Message Date
Steffen Allner 7d19f83982 Add test for setuponly option 2016-06-22 12:00:45 +02:00
Oliver Bestwalter 7d87a1b127 Add test for failing assertion 
Should contain function name that caused the failure (see pull request #1631).
 2016-06-22 11:23:50 +02:00
Vasily Kuznetsov 6874c3a3cc Factor setuponly code out of runtestprotocol(). 2016-06-22 11:09:54 +02:00
Ronny Pfannschmidt 24179dc99f Merge pull request #1639 from tomviner/fix-changelog-links 
fix changelog links
 2016-06-22 10:49:35 +02:00
Tom Viner ec25d398a5 fix changelog links 2016-06-22 10:06:14 +02:00
Tom Viner 98adf204b2 issue 1553: Include terminal newlines in diffs 2016-06-22 09:50:15 +02:00
Steffen Allner 499c9551c8 Implement working version of --setuponly 2016-06-22 09:42:45 +02:00
Bruno Oliveira 144dc12e55 Merge pull request #1638 from blueyed/fix-CONTRIBUTING 
CONTRIBUTING.rst: spelling fixes
 2016-06-22 04:28:15 -03:00
Daniel Hahler 09389d2b20 CONTRIBUTING.rst: spelling fixes 
[ci skip]
 2016-06-22 09:14:07 +02:00
Bruno Oliveira c3ee1c17bc Merge pull request #1620 from tomviner/issue460/parameterized-subrequest 
Issue 460: Fail on getfuncargvalue(<fixture with params>)
 2016-06-21 13:43:06 -03:00
Bruno Oliveira 4350f499b2 Merge branch 'issue1629' of https://github.com/davehunt/pytest into features 2016-06-21 18:37:14 +02:00
Bruno Oliveira 61ede096a3 Merge pull request #1631 from Avira/master 
help the user in the rare case this assertion actually fails
 2016-06-21 13:17:52 -03:00
Bruno Oliveira 2f9d5c2586 Merge pull request #1623 from blueyed/ignore-hidden-files-in-test_pytest_collect_file 
Ignore hidden files (.testmondata) in test_pytest_collect_file
 2016-06-21 13:17:20 -03:00
Bruno Oliveira f05d65dc42 Merge pull request #1622 from nicoddemus/issue-1619-conftest-assert-rewrite 
Issue 1619 conftest assert rewrite
 2016-06-21 13:15:52 -03:00
Bruno Oliveira 573866bfad Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite 2016-06-21 18:10:19 +02:00
Bruno Oliveira 2305d3271d Merge pull request #1628 from omarkohl/exit_on_collection_error 
Exit pytest on collection error (without executing tests)
 2016-06-21 13:03:21 -03:00
Bruno Oliveira 406355fd10 Merge pull request #1624 from blueyed/getexecutable-skip-non-zero-returncode 
tests: getexecutable: call `--version` on all Pythons
 2016-06-21 12:51:48 -03:00
Dave Hunt 393167b94f Update CHANGELOG and add Oliver Bestwalter to AUTHORS 2016-06-21 16:59:14 +02:00
Dave Hunt ef9dd14963 Introduce pytest command as recommended entry point 
Fixes #1629
 2016-06-21 16:16:57 +02:00
Oliver Bestwalter 2b5c2f3ed5 help the user in the rare case this assertion actually fails 2016-06-21 14:57:48 +02:00
Omar Kohl ede7478dcc Exit pytest on collection error (without executing tests) 
Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.

Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.

Implemented via pair programming with:
    Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>

closes #1421
 2016-06-21 13:32:34 +02:00
Bruno Oliveira 819942e964 Return explicit None from rewrite hook's find_module 2016-06-21 12:28:36 +02:00
Bruno Oliveira 8b0fb47c79 Remove print left by accident 2016-06-21 12:23:12 +02:00
Tom Viner 5854a71ece Issue 460: getfuncargvalue fixture w. params err 2016-06-21 11:29:21 +02:00
Bruno Oliveira 5d8d1db4df Update repository transfer instructions 2016-06-21 09:40:22 +02:00
Floris Bruynooghe 9118c0222f Merge .set_config() into constructor 2016-06-21 09:28:10 +02:00
Daniel Hahler e53e45b55c tests: getexecutable: call `--version` on all Pythons 
This should prevent errors from pyenv:

    pyenv: python2.6: command not found

    The `python2.6' command exists in these Python versions:
      2.6.9

While the pyenv wrapper explicitly returns 127, I think it is better to
just check for non-zero?!
 2016-06-21 08:36:02 +02:00
Bruno Oliveira e0cb046885 Update AUTHORS and CHANGELOG 2016-06-20 23:16:06 +02:00
Bruno Oliveira 3a81d2e012 conftest files now use assertion rewriting 
Fix #1619
 2016-06-20 23:13:29 +02:00
Daniel Hahler e9d7989140 Ignore hidden files (.testmondata) in test_pytest_collect_file 
`test_pytest_collect_file` fails if you run the tests using `--testmon`,
because pytest-testmon will put its DB there as `.testmondata`.
 2016-06-20 22:30:36 +02:00
Florian Bruhin 54872e94b4 Fix test name typo 2016-06-20 18:44:34 +02:00
Florian Bruhin 4f2db6c08d Merge pull request #1616 from palaviv/pytest.raises-message 
Pytest.raises custom error message
 2016-06-20 18:43:12 +02:00
Ronny Pfannschmidt f3aead8e49 Merge pull request #1600 from nicoddemus/issue-1599-disable-cap-fixtures 
Add disabled() method to capsys and capfd
 2016-06-20 15:55:54 +02:00
palaviv f8d4cadc3d Added versionchanged directives 2016-06-19 23:56:43 +03:00
palaviv c29130d400 Updated documentation 2016-06-19 23:34:42 +03:00
palaviv ca093673fb pytest.raises accept cutom message only when used as context manager 2016-06-19 21:24:47 +03:00
Bruno Oliveira d81ee9acfb Merge pull request #1597 from taschini/pyargs-fix 
Ensure that a module within a namespace package can be found by --pyargs
 2016-06-19 14:20:52 -03:00
Bruno Oliveira 72bf11cbe9 Add disabled() method to capsys and capfd 
Fix #1599
 2016-06-19 19:14:36 +02:00
palaviv e6ff01ada3 CR fixes 2016-06-16 21:09:15 +03:00
palaviv 8ddbca36c9 Add CHANGLOG entry 2016-06-16 20:21:03 +03:00
palaviv d21886c005 pytest.raises accpets custom message 2016-06-16 20:15:32 +03:00
Bruno Oliveira 7f8e315285 Merge pull request #1615 from gnprice/deadcode 
Cut a dead test helper function
 2016-06-16 00:42:01 -03:00
Bruno Oliveira c5424643f0 Merge pull request #1614 from gnprice/loop 
Simplify default pytest_runtestloop
 2016-06-16 00:29:03 -03:00
Greg Price ab8b2e75a3 Simplify default pytest_runtestloop 
The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.

Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler.
 2016-06-15 18:27:08 -07:00
Greg Price 2a3cbdf4d1 Cut a dead test helper function 
This appears to have been unused since commit
320835d "split out pytest-xdist related reporting to the plugin"
in July 2010.  It's the only caller outside of _pytest/runner.py
of the `call_and_report` helper function there, so cutting it out
makes that more of a pure helper function and makes it slightly
easier to understand the code in _pytest/runner.py .
 2016-06-15 18:26:10 -07:00
Bruno Oliveira 308396ae3c Merge pull request #1606 from hackebrot/show-fixtures-per-test 
Show fixtures per test
 2016-06-14 09:54:18 -03:00
Ronny Pfannschmidt feeee2803e Merge pull request #1586 from nicoddemus/issue-1461-merge-yield-fixture 
Make normal fixtures work with "yield"
 2016-06-14 10:31:09 +02:00
taschini 1218392413 Added taschini to AUTHORS and #1597 to CHANGELOG.rst. 2016-06-14 07:16:20 +02:00
taschini 4d9e293b4d Incorporated feedback (#1597). 
Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected.
 2016-06-14 07:12:40 +02:00
taschini e2e6e31711 Ensure that a module within a namespace package can be found by --pyargs. 2016-06-14 07:12:40 +02:00