dd97a2e7c8
Merge from upstream
2016-06-22 17:51:48 +02:00
0dbf77e08e
Add to changelog and authors.
2016-06-22 17:37:58 +02:00
f7d50dfa91
Add a test for handling of dynamic requests for fixtures from other fixtures
2016-06-22 17:24:55 +02:00
7d60fcc098
Merge pull request #1643 from RonnyPfannschmidt/merge-master
...
Merge master
2016-06-22 17:05:59 +02:00
c8c32fd9c0
Merge with upstream
2016-06-22 17:00:35 +02:00
61992b4e22
Implement --setup-plan option
2016-06-22 16:45:36 +02:00
f59d8f7720
Fix the tests ( #3 )
...
* Fix the tests
* Fix .format string failures on python 2.6
2016-06-22 16:23:58 +02:00
18ef7de96b
merge from master again
2016-06-22 16:03:52 +02:00
e96cd51a2a
Merge remote-tracking branch 'upstream/features' into merge-master
2016-06-22 16:03:00 +02:00
f7585c7549
Merge pull request #1635 from Avira/master
...
Add test for change in pull request #1631
2016-06-22 15:49:09 +02:00
9cb851716d
Merge pull request #1644 from KangarooCreativeTeam/patch-1
...
cache.rst: Fix wrong command used
2016-06-22 15:46:09 +02:00
a2420ce051
Merge pull request #1640 from Avira/features
...
Add tests for entry points (#1629 )
2016-06-22 15:41:19 +02:00
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
5e0d78f4f1
Fix .format string failures on python 2.6
2016-06-22 14:53:37 +02:00
083f64100d
merge master into features
2016-06-22 14:39:33 +02:00
db79ed5c4d
Add tests to make sure expected entry points exist ( #1629 )
2016-06-22 14:28:53 +02:00
fb79fa711b
Merge branch 'issue1553/diff-final-newline' of https://github.com/tomviner/pytest
2016-06-22 14:21:30 +02:00
1a75139f72
Fix the tests
2016-06-22 13:25:46 +02:00
ee311e1eae
Merge pull request #2 from kvas-it/features
...
Add printing of fixture dependencies
2016-06-22 13:04:23 +02:00
2c5c4f3f78
Add printing of fixture dependencies
2016-06-22 12:54:36 +02:00
2c6cfa42fa
Disable capturing for setuponly output
2016-06-22 12:14:35 +02:00
de9ed5e3f4
Merge pull request #1 from kvas-it/features
...
Factor setuponly code out of runtestprotocol().
2016-06-22 12:04:45 +02:00
92bcc36266
Refactor logging of fixtures
2016-06-22 12:01:51 +02:00
7d19f83982
Add test for setuponly option
2016-06-22 12:00:45 +02:00
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
6874c3a3cc
Factor setuponly code out of runtestprotocol().
2016-06-22 11:09:54 +02:00
24179dc99f
Merge pull request #1639 from tomviner/fix-changelog-links
...
fix changelog links
2016-06-22 10:49:35 +02:00
ec25d398a5
fix changelog links
2016-06-22 10:06:14 +02:00
98adf204b2
issue 1553: Include terminal newlines in diffs
2016-06-22 09:50:15 +02:00
499c9551c8
Implement working version of --setuponly
2016-06-22 09:42:45 +02:00
144dc12e55
Merge pull request #1638 from blueyed/fix-CONTRIBUTING
...
CONTRIBUTING.rst: spelling fixes
2016-06-22 04:28:15 -03:00
09389d2b20
CONTRIBUTING.rst: spelling fixes
...
[ci skip]
2016-06-22 09:14:07 +02:00
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
4350f499b2
Merge branch 'issue1629' of https://github.com/davehunt/pytest into features
2016-06-21 18:37:14 +02:00
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
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
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
573866bfad
Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite
2016-06-21 18:10:19 +02:00
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
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
393167b94f
Update CHANGELOG and add Oliver Bestwalter to AUTHORS
2016-06-21 16:59:14 +02:00
ef9dd14963
Introduce pytest command as recommended entry point
...
Fixes #1629
2016-06-21 16:16:57 +02:00
2b5c2f3ed5
help the user in the rare case this assertion actually fails
2016-06-21 14:57:48 +02:00
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
819942e964
Return explicit None from rewrite hook's find_module
2016-06-21 12:28:36 +02:00
8b0fb47c79
Remove print left by accident
2016-06-21 12:23:12 +02:00
5854a71ece
Issue 460: getfuncargvalue fixture w. params err
2016-06-21 11:29:21 +02:00
5d8d1db4df
Update repository transfer instructions
2016-06-21 09:40:22 +02:00
9118c0222f
Merge .set_config() into constructor
2016-06-21 09:28:10 +02:00
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
Steffen Allner
Vasily Kuznetsov
Ronny Pfannschmidt
Ronny Pfannschmidt
HEAD KANGAROO
Oliver Bestwalter
Bruno Oliveira
Tom Viner
Daniel Hahler
Dave Hunt
Omar Kohl
Floris Bruynooghe