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

5270 Commits

Author SHA1 Message Date
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
RedBeardCode e2f550156e Improve of the test output for logical expression with brackets. 
Fixes #925
 2016-06-25 18:10:36 +02:00
Bruno Oliveira c519b9517a Merge pull request #1663 from aostr/master 
Rename the default plugin "pdb" into "debugging"
 2016-06-25 09:56:54 -03:00
Bruno Oliveira e0242146ec Merge pull request #1666 from pytest-dev/1564-changelog 
Add changelog entry for #1564
 2016-06-25 09:34:21 -03:00
Bruno Oliveira df17f862fa Merge pull request #1648 from blueyed/simplify-Argument-__repr__ 
Simplify Argument.__repr__
 2016-06-25 09:26:50 -03:00
Bruno Oliveira 7eb1318db2 Merge pull request #1656 from pytest-dev/rm-indiegogo-links 
Update website wrt indiegogo campaign
 2016-06-25 09:22:07 -03:00
Florian Bruhin ce603dc0ea Add changelog entry for #1564 2016-06-25 14:18:41 +02:00
Ronny Pfannschmidt 70ea3ce7f7 Merge pull request #1564 from The-Compiler/issue1479 
Don't ignore ImportError when importing setuptools plugins
 2016-06-25 14:09:48 +02:00
aostr 9a5224e2f8 Renamed the pdb module and changed unit tests accordingly 2016-06-25 12:37:31 +02:00
aostr 05b5554cac Renamed pytest pdb to debugging which conflicts with python pdb. 
Combining multiple imports the "import pdb" imports the pytest module
as opposed to the python debugger.
 2016-06-25 12:09:05 +02:00
Florian Bruhin 757f37f445 Don't ignore ImportError with setuptools plugins 
This was added in b2d66b9e7b but is a bad
idea. When a plugin can't be imported, commandline options (optionally
set in pytest.ini) could be undefined, which means pytest bails out
much earlier before showing the warning, which is hard to debug.

Fixes #1479, also see #1307 and #1497
 2016-06-25 09:56:22 +02:00
Daniel Hahler 939407ef63 Simplify Argument.__repr__ 
I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997).
 2016-06-25 09:31:31 +02:00
Bruno Oliveira 0c63762d9c Merge pull request #1654 from tomviner/issue1503/remove_collapse_false 
Fixes #1503 no longer collapse false explanations
 2016-06-24 12:53:49 -03:00
Brianna Laugher 7612b650a0 update sprint page to be past tense 2016-06-24 17:24:06 +02:00
Brianna Laugher 62255d8000 rm global header 2016-06-24 17:12:41 +02:00
Brianna Laugher ea5bda0898 remove links to funding campaign 2016-06-24 17:11:29 +02:00
Tom Viner 77689eb486 Fixes #1503 no longer collapse false explanations 2016-06-24 15:35:24 +02:00
Bruno Oliveira 3d263c64c3 Merge pull request #1626 from tomviner/issue1625/rename-getfuncargvalue 
issue1625, rename getfuncargvalue to getfixturevalue
 2016-06-24 08:58:32 -03:00
Tom Viner df9918eda3 issue1625, name getfuncargvalue to getfixturevalue 2016-06-24 10:08:19 +02:00
Florian Bruhin 6359e75ff8 Trivial spelling fix in runtest_setup.py 2016-06-22 20:18:00 +02:00
Ronny Pfannschmidt f7585c7549 Merge pull request #1635 from Avira/master 
Add test for change in pull request #1631
 2016-06-22 15:49:09 +02:00
Ronny Pfannschmidt 9cb851716d Merge pull request #1644 from KangarooCreativeTeam/patch-1 
cache.rst: Fix wrong command used
 2016-06-22 15:46:09 +02:00
HEAD KANGAROO be1dabd6a9 cache.rst: Fix wrong command used 
The "Inspecting Cache content" section was showing --cache-clear command,
  but should actually be using --cache-show command.

  Also; update AUTHORS
 2016-06-22 14:04:02 +01:00
Bruno Oliveira fb79fa711b Merge branch 'issue1553/diff-final-newline' of https://github.com/tomviner/pytest 2016-06-22 14:21:30 +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
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
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 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 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
Oliver Bestwalter 2b5c2f3ed5 help the user in the rare case this assertion actually fails 2016-06-21 14:57:48 +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
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
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
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 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
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
Ronny Pfannschmidt 66e66f61e8 Merge pull request #1605 from guyzmo/issue/1604 
Fixed issue shadowing error when missing argument on teardown_method
 2016-06-12 12:05:37 +02:00
Guyzmo accd962c9f Fixed issue shadowing error when missing argument on teardown_method 
When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.

This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.

* fixes issue #1604

Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
 2016-06-12 03:45:24 +02:00