floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,573 Commits 32 Branches 205 Tags
aa145fa83e6b2d6e7abcf408bc9df2893d5f4f52
Commit Graph

5573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Oliveira
9fb5ddf778 Fix shell argument split in win32 
This fixes the bug inserted by accident in #1523
 2016-05-23 20:41:47 -03:00
Bruno Oliveira
5ab5a11544 Merge pull request #1565 from tomviner/issue1544/ignore-build-dist-dirs 
Issue 1544: norecursedirs build & dist dirs
 2016-05-23 19:30:20 -03:00
Ronny Pfannschmidt
26b526967e merge from master again 2016-05-23 22:33:00 +02:00
TomV
d6dfb1a393 issue 1544: norecursedirs build & dist dirs 2016-05-23 21:02:29 +01:00
Ronny Pfannschmidt
85393d34b6 Merge pull request #1561 from AbdealiJK/ajk/1558_feature 
unittest.UnitTestCase: Allow __test__ for methods
 2016-05-19 10:17:28 +02:00
Ronny Pfannschmidt
be7a86270c Merge pull request #1541 from RonnyPfannschmidt/document-1540 
Document #1540
 2016-05-19 10:15:33 +02:00
AbdealiJK
d4c9fa9f1a unittest.UnitTestCase: Allow __test__ for methods 
__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.

Fixes https://github.com/pytest-dev/pytest/issues/1558
 2016-05-19 08:19:57 +05:30
Ronny Pfannschmidt
ec5e05834f fix typo 2016-05-18 21:35:31 +02:00
Ronny Pfannschmidt
6f98cd6faa Merge pull request #1560 from nicoddemus/fix-py26-tox-comment 
Move comment in tox.ini due to recent bug in pip
 2016-05-18 21:31:56 +02:00
Bruno Oliveira
561a5fb558 Move comment in tox.ini due to recent bug in pip 
As discussed in #1554

* https://bitbucket.org/hpk42/tox/issues/332/
* https://github.com/pypa/pip/issues/3667
 2016-05-18 16:15:29 -03:00
Bruno Oliveira
47739291cf Merge pull request #1557 from adamchainz/readthedocs.io 
Convert readthedocs link for their .org -> .io migration for hosted projects
 2016-05-18 13:24:03 -03:00
Adam Chainz
8a39869347 Convert readthedocs link for their .org -> .io migration for hosted projects 
As per their email ‘Changes to project subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub` - since it doesn't work on `readthedocs.io`.
 2016-05-18 17:12:39 +01:00
Ronny Pfannschmidt
eab762ea99 Merge branch 'master' into merge-master 2016-05-13 19:37:41 +02:00
Ronny Pfannschmidt
c49863aa63 merge next chunk from master and fix changelog linting issue 2016-05-13 19:36:47 +02:00
Ronny Pfannschmidt
01d2ff804b Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master 2016-05-13 17:55:02 +02:00
Ronny Pfannschmidt
68f658b6cc Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master 2016-05-13 17:52:59 +02:00
Ronny Pfannschmidt
4bde70d060 Merge commit 'ec62a3c9e47c3b5b07aa1656815145ffa2882a09' into merge-master 2016-05-13 17:40:14 +02:00
Ronny Pfannschmidt
8a94c66e68 Merge pull request #1551 from fushi/master 
Fix #1549 - count skips in junit-xml
 2016-05-05 22:03:30 +02:00
John Towler
0d07b64571 Fixes Issue 1549 2016-05-05 11:29:05 -07:00
Ronny Pfannschmidt
98dd2ce75c document reason for #1540 2016-04-28 16:22:31 +02:00
Ronny Pfannschmidt
308e76e19c add xfailing test for #1540 2016-04-28 16:11:30 +02:00
Florian Bruhin
60212e8831 Merge pull request #1537 from ben4ever/patch-1 
Fix typo in doc
 2016-04-27 22:13:51 -07:00
Benjamin Dopplinger
75abfbe8d4 Fix typo in doc 2016-04-28 14:40:17 +10:00
Ronny Pfannschmidt
6cc56b4a1b Merge pull request #1535 from palaviv/parametrize-test-ids-hook 
introduce pytest_make_parametrize_id hook
 2016-04-27 16:16:16 +02:00
palaviv
9733127951 pytest_make_parametrize_id receive config object 2016-04-26 10:23:57 +03:00
Bruno Oliveira
fdee88f086 Merge pull request #1520 from omarkohl/invalid_test_module_name 
Raise CollectError if import test module fails
 2016-04-25 21:42:41 -03:00
palaviv
53429ed8b8 Added hook to plugin docs and new CHANGELOG record 2016-04-25 18:03:34 +03:00
palaviv
b9faf78d51 Added test_pytest_make_parametrize_id 2016-04-25 17:48:28 +03:00
palaviv
79927428d1 Added pytest_make_parametrize_id hook 2016-04-25 17:11:47 +03:00
Omar Kohl
56855893ca Raise CollectError if import test module fails 
One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.

fix #1426
 2016-04-23 13:50:48 +02:00
Ronny Pfannschmidt
52babba33e Update sprint 2016 2016-04-23 08:56:28 +02:00
Bruno Oliveira
8552860a9b Merge pull request #1532 from RibeiroAna/features 
Update sprint2016.rst :)
 2016-04-23 01:05:25 -03:00
Ana Ribeiro
f02f72e651 Update sprint2016.rst 2016-04-23 00:11:44 -03:00
Ronny Pfannschmidt
6d661ace0a Merge pull request #1523 from MengJueM/master 2016-04-20 16:55:31 +02:00
MengJueM
f51c34ef31 Add changelog 2016-04-20 22:32:35 +08:00
Ronny Pfannschmidt
b220c96bf8 Merge pull request #1526 from The-Compiler/tracebackhide 
Filter selectively with __tracebackhide__
 2016-04-20 13:07:02 +02:00
Florian Bruhin
aa87395c39 Use py.builtin.callable 
This restores compatibility with Python 3.0/3.1
 2016-04-20 11:18:47 +02:00
Florian Bruhin
75160547f2 Use a callable __tracebackhide__ for filtering 
While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible.
 2016-04-20 11:09:27 +02:00
Florian Bruhin
4c552d4ef7 Fix tests for python 2.6 2016-04-20 10:36:13 +02:00
Florian Bruhin
b607f6728f Filter selectively with __tracebackhide__ 
When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens.
 2016-04-20 10:25:33 +02:00
Ronny Pfannschmidt
a986b8f945 Merge pull request #1525 from The-Compiler/traceback-item 
Fix TracebackItem documentation in pytest.code
 2016-04-20 09:38:03 +02:00
Florian Bruhin
c24e8e01b4 Fix TracebackItem documentation in pytest.code 
The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry.
 2016-04-20 08:35:17 +02:00
MengJueM
1a37035d71 Add test test_absolute_win32_path 2016-04-20 01:27:37 +08:00
TomV
99c4b6fdc3 issue 1496 - xfail with condition keyword 2016-04-19 18:12:37 +01:00
Meng Jue
dd2425675b Fix a small issue about shlex.split not working well with win32 path 2016-04-19 13:08:08 +08:00
Bruno Oliveira
6a3c943ce2 Merge pull request #1514 from The-Compiler/docfix 
doc: Use ascii chars for file tree
 2016-04-13 19:13:53 -03:00
Florian Bruhin
98430a17f2 doc: Use ascii chars for file tree 
LaTeX doesn't like those particular unicode chars, so let's avoid them so the
PDF builds easily.
 2016-04-13 23:38:58 +02:00
Bruno Oliveira
fe6e1b2059 Merge pull request #1506 from prusse-martin/fix-repr-tb-with-unicode 
Fix `repr_traceback` to work with unicode errors
 2016-04-09 13:03:55 -03:00
Martin Prusse
7ce5873da2 Perform a "unicode aware" check for maximum recursion depth error 
Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors.
 2016-04-08 23:32:18 -03:00
Ronny Pfannschmidt
0eb80bcb5a Merge pull request #1504 from guettli/patch-1 
Hudson -> Jenkins
 2016-04-05 14:57:03 +02:00