p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,258 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

5258 Commits

Author SHA1 Message Date
Bruno Oliveira d911bfcb8a Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest 
# Conflicts:
#	CHANGELOG.rst
 2016-07-25 18:26:50 -03:00
Bruno Oliveira 8f29ce26e9 Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest 2016-07-25 18:20:17 -03:00
Dmitry Dygalo d72afe7e08 Fixed scope override inside metafunc.parametrize. Fixes #634 2016-07-25 12:42:50 +02:00
Florian Bruhin a2b04d02c2 Merge pull request #1759 from Stranger6667/issue1579-invalid-class 
Fixed collection of classes with custom ``__new__`` method. Fixes #1579.
 2016-07-25 12:27:51 +02:00
Dmitry Dygalo f7ad173fee Fixed collection of classes with custom ``__new__`` method 2016-07-25 11:33:37 +02:00
Ronny Pfannschmidt d37af20527 Merge pull request #1765 from The-Compiler/1763-cleanup 
Cleanups for #1763
 2016-07-25 10:31:06 +02:00
Florian Bruhin a309a571d9 Cleanups for #1763 2016-07-25 10:17:46 +02:00
Edoardo Batini e9d729bd46 drop parenthesis around GH issue number 2016-07-25 10:11:37 +02:00
Bruno Oliveira c9a2e611ce Merge pull request #1763 from tomviner/issue1210-exit-msg 
Fix #1210 display msg for early calls to exit
 2016-07-24 13:05:44 -03:00
Tom Viner 42adaf5a61 Fix #1210 display msg for early calls to exit 2016-07-24 14:16:34 +02:00
Edoardo Batini 0ae77be9f0 Add new target links in CHANGELOG 2016-07-24 00:46:06 +02:00
Edoardo Batini f450e0a1db Thanks to Tom Viner for his guidance during EuroPython2016 sprint 2016-07-24 00:06:16 +02:00
Edoardo Batini fabe8cda2f Thanking myself in CHANGELOG 2016-07-23 23:59:34 +02:00
Edoardo Batini 3c4158ac35 Add changelog entry for this bugfix branch 2016-07-23 23:51:11 +02:00
Edoardo Batini e00199212c Add myself to the AUTHORS 2016-07-23 23:49:44 +02:00
Edoardo Batini e9a67e6702 Adjust test involving FixtureLookupErrorRepr 
I added a starting 'E' to the expected error messages.

The tests were still passing after the previous patch but I think it's
better to have stricter tests.
 2016-07-23 23:45:07 +02:00
Edoardo Batini 6799a47c78 Start FixtureLookupErrorRepr with an 'E' 2016-07-23 23:43:34 +02:00
Bruno Oliveira 655df7f839 Merge pull request #1755 from diegorusso/master 
Testcase for overriding autouse fixture with a parametrized fixture.
 2016-07-23 12:53:24 -03:00
Diego Russo 1704b7d265 Test case for overriding autouse fixtures 
Test case for overriding autouse fixture with a parametrized fixture.
The test covers the problem explained in the issue 1601
Adding Diego Russo to AUTHORS
 2016-07-23 16:53:39 +02:00
Bruno Oliveira 018acc6bae Explain why thanks yourself in the CHANGELOG 2016-07-23 10:44:38 -03:00
Bruno Oliveira 38e0e08074 Merge pull request #1751 from javiromero/docstrings 
Uppercase first word in docstrings. Change to an imperative form.
 2016-07-22 10:33:58 -03:00
Javi Romero 1aab6e3bc2 Add changes to changelog. 2016-07-22 12:54:42 +02:00
Javi Romero 7e37497d5a Uppercase first word in docstrings. Change to an imperative form. Add name to authors. 2016-07-22 12:39:06 +02:00
Florian Bruhin 14af12cb7b Merge pull request #1717 from nicoddemus/nose-yield-tests-docs 
Document limitations for yield-tests in nose
 2016-07-14 14:40:27 +02:00
Bruno Oliveira 9007e16cdf Document limitations for yield-tests in nose 
Also add nose doc to the root toctree

Closes #1716
 2016-07-14 08:20:01 -03:00
Bruno Oliveira 44c3055e79 Merge pull request #1721 from bronsen/patch-1 
Docs: De-404 links in changelog
 2016-07-13 10:05:14 -03:00
Kalle Bronsen dfe1209d2c De-404 links in changelog 2016-07-13 11:41:27 +02:00
Ronny Pfannschmidt cc0920ceb1 Merge pull request #1699 from nicoddemus/404-links-on-talks-docs 
Fix links and removed 404 links from talks.rst
 2016-07-05 08:44:23 +02:00
Florian Bruhin 067e044f97 Merge pull request #1700 from nicoddemus/split-appveyor 
Split AppVeyor test runs in multiple jobs to avoid timeout issues
 2016-07-05 06:43:39 +02:00
Bruno Oliveira 10c5e6fd9c Split AppVeyor test runs in multiple jobs to avoid timeout issues 
Some of our builds have been timing out (over 1 hour),
on AppVeyor
 2016-07-04 21:54:21 -03:00
Bruno Oliveira 8d39ce17da Fix links and removed 404 links from talks.rst 
Fix #1696
 2016-07-04 21:32:57 -03:00
Bruno Oliveira f74dd8550f Merge pull request #1692 from pytest-dev/changelog 
Add changelog to requirements for pytest-dev plugins
 2016-06-30 17:39:14 -03:00
Florian Bruhin e3c43a1462 Add changelog to requirements for pytest-dev plugins 
Closes #1691
 2016-06-30 22:25:09 +02:00
Bruno Oliveira 75ecd94294 Merge pull request #1689 from quodlibetor/autouse-docs 
Document the interaction of autouse scopes
 2016-06-29 18:08:06 -03:00
Brandon W Maister 771c4539fa Document the interaction of autouse scopes 
I wouldn't have even attempted what I did to cause #1688 if this had
been there.
 2016-06-29 16:52:13 -04:00
Florian Bruhin 1e60294188 Merge pull request #1679 from eli-b/patch-1 
catched -> caught
 2016-06-27 18:02:16 +02:00
Eli Boyarski 21d27784eb catched -> caught 
Even though catch is a Python keyword, 'catched' just looks terrible in text.
If the text was supposed to reference the keyword, then 'catched' should be changed to "'catch'ed".
 2016-06-27 15:41:40 +03:00
Bruno Oliveira 7e78965c79 Merge branch 'logic_brackets' 2016-06-26 21:34:37 +02:00
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