floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,154 Commits 32 Branches 205 Tags
1a8d9bf2549ab2c74aec4000599b8d6afc3a631b
Commit Graph

9154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicholas Devenish
1a8d9bf254 Let approx() work on more generic sequences 
approx() was updated in 9f3122fe to work better with numpy arrays,
however at the same time the requirements were tightened from
requiring an Iterable to requiring a Sequence - the former being
tested only on interface, while the latter requires subclassing or
registration with the abc.

Since the ApproxSequence only used __iter__ and __len__ this commit
reduces the requirement to only what's used, and allows unregistered
Sequence-like containers to be used.

Since numpy arrays qualify for the new criteria, reorder the checks so
that generic sequences are checked for after numpy arrays.
 2018-11-18 20:01:11 +00:00
Daniel Hahler
62967b3110 Merge pull request #4367 from blueyed/determine_setup 
Optimize/revisit determine_setup
 2018-11-18 12:52:07 +01:00
Ronny Pfannschmidt
5872e1c35a Merge pull request #4392 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-11-15 06:59:42 +01:00
Bruno Oliveira
9dec146edf Merge pull request #4388 from nicoddemus/release-4.0.0 
Release 4.0.0
 2018-11-14 15:11:09 -02:00
Bruno Oliveira
c2d6b3524c Preparing release version 4.0.0 4.0.0 2018-11-13 21:01:51 +00:00
Bruno Oliveira
e025974cbd Merge remote-tracking branch 'upstream/master' into release-4.0.0 2018-11-13 20:58:24 +00:00
Bruno Oliveira
fea09cda6c Merge pull request #4383 from nicoddemus/merge-master-into-features 
Merge master into features (about to prepare 4.0)
 2018-11-13 18:57:41 -02:00
Daniel Hahler
ba457f5feb Optimize/revisit determine_setup 2018-11-13 20:14:24 +01:00
Daniel Hahler
ed91d5f086 config: set invocation_dir in the constructor already 
This allows to make use of it when determining the rootdir etc.
 2018-11-13 20:14:24 +01:00
Daniel Hahler
b7863a5f48 Merge pull request #4381 from blueyed/callinfo-repr 
Fix CallInfo.__repr__ for unfinished call
 2018-11-13 18:13:58 +01:00
Daniel Hahler
a72eff5a08 Merge pull request #4382 from blueyed/pytester-pop-TOX_ENV_DIR 
pytester: pop TOX_ENV_DIR from os.environ
 2018-11-13 12:42:51 +01:00
Daniel Hahler
46c8363e12 Merge pull request #4380 from blueyed/improve-ci 
Travis: move faster builds to baseline
 2018-11-13 12:40:26 +01:00
Bruno Oliveira
557cb6cffe Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-13 09:01:37 -02:00
Bruno Oliveira
8198e7cd33 Merge pull request #4349 from nicoddemus/pytest4-warnings-as-errors 
Change RemovedInPytest4Warnings to errors by default
 2018-11-13 08:31:47 -02:00
Daniel Hahler
a6a96469ca pytester: pop TOX_ENV_DIR from os.environ 
Closes: https://github.com/pytest-dev/pytest/pull/4378
Fixes: https://github.com/pytest-dev/pytest/issues/4366
 2018-11-13 09:02:52 +01:00
Daniel Hahler
27dab4e05f Fix CallInfo.__repr__ for unfinished call 
Fixes https://github.com/pytest-dev/pytest/issues/3554
Ref: https://github.com/pytest-dev/pytest/pull/3560
Ref: https://github.com/pytest-dev/pytest/pull/3562
 2018-11-13 08:51:43 +01:00
Daniel Hahler
3e05848ab9 AppVeyor: run py{27,37}-xdist first 2018-11-13 01:33:05 +01:00
Daniel Hahler
5902e5a2ce Travis: move faster builds to baseline 
- use py27-pexpect,py27-trial,py27-numpy and py37-xdist in baseline,
  using pexpect there catches errors with pdb tests early, and
  py37-xdist is much faster than py37.
- move py34 and py36 out of baseline.
 2018-11-13 01:26:22 +01:00
Bruno Oliveira
243d898b38 Merge pull request #4373 from blueyed/py37-by-default 
CI: use py37 instead of py36 by default
 2018-11-12 20:56:10 -02:00
Bruno Oliveira
f8f22d29ee Use a custom cache directory for test_stepwise tests 
Otherwise the tests will use tox's env cache which makes them flaky
 2018-11-12 16:57:39 -02:00
Bruno Oliveira
dc20dedbc7 Change RemovedInPytest4Warnings to errors by default 
To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:

* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.

Fix #3737
 2018-11-12 16:10:57 -02:00
Bruno Oliveira
3cec1482eb Merge branch 'master' into py37-by-default 2018-11-12 14:03:59 -02:00
Bruno Oliveira
0df5ce4082 Fix basepython for linting testenv in tox.ini 2018-11-12 14:03:04 -02:00
Bruno Oliveira
93a9836962 Merge pull request #4374 from blueyed/doctesting 
CI: doctesting uses coverage, fiy py37 on AppVeyor
 2018-11-12 13:57:58 -02:00
Daniel Hahler
935b106213 CI: use py37 instead of py36 by default 
Closes https://github.com/pytest-dev/pytest/issues/4370.
 2018-11-12 03:16:52 +01:00
Daniel Hahler
74366426b9 Travis: use last TOXENV for PATH 2018-11-11 22:08:45 +01:00
Daniel Hahler
9628242423 CI: doctesting uses coverage, fiy py37 on AppVeyor 2018-11-11 21:49:59 +01:00
Bruno Oliveira
9af613bef2 Merge pull request #4372 from nicoddemus/release-3.10.1 
Release version 3.10.1
 2018-11-11 15:35:21 -02:00
Bruno Oliveira
7b833ce5f9 Merge pull request #4368 from blueyed/toxenv-coverage 
Travis: use coverage from existing tox env  [skip appveyor]
 2018-11-11 11:57:20 -02:00
Bruno Oliveira
11a9cbd50b Merge pull request #4365 from blueyed/xenial 
Travis: use Xenial by default  [skip appveyor]
 2018-11-11 11:55:06 -02:00
Bruno Oliveira
2626bd9afa Preparing release version 3.10.1 3.10.1 2018-11-11 13:43:04 +00:00
Bruno Oliveira
b6f16abfe0 Merge pull request #4369 from blueyed/cleanup 
Cleanup/follow-up to #4319
 2018-11-11 11:38:06 -02:00
Bruno Oliveira
e5a9f92dfb Merge pull request #4337 from blueyed/fix-sym 
Fix collection of symlinked files
 2018-11-11 11:36:31 -02:00
Daniel Hahler
a6ff5e6bfc Cleanup/follow-up to #4319 2018-11-11 01:38:34 +01:00
Daniel Hahler
be15ad8d25 Fix collection of direct symlinked files not in python_files 
Fixes https://github.com/pytest-dev/pytest/issues/4325.
 2018-11-11 01:37:06 +01:00
Daniel Hahler
dc9ceda5d2 Travis: use Xenial by default [skip appveyor] 2018-11-11 01:02:06 +01:00
Daniel Hahler
825085f699 Travis: use coverage from existing tox env [skip appveyor] 2018-11-11 00:59:46 +01:00
Daniel Hahler
b1312147e0 Merge pull request #4358 from blueyed/instance 
Node: do not add "::()" to nodeid
 2018-11-11 00:42:57 +01:00
Daniel Hahler
7ab3d818f0 Merge pull request #4356 from blueyed/fix-equal_with_bash 
tests: fix equal_with_bash to handle appearing .coverage files
 2018-11-11 00:42:23 +01:00
Daniel Hahler
f551cb9677 Skip Instances with --collect-only 2018-11-10 23:48:02 +01:00
Daniel Hahler
87254ca593 Add test for --deselect without "::()" 
Closes: https://github.com/pytest-dev/pytest/issues/4127.
 2018-11-10 23:46:41 +01:00
Daniel Hahler
ac8b9c6e9d Node: do not add "::()" to nodeid 
Fixes https://github.com/pytest-dev/pytest/issues/4127.
 2018-11-10 23:46:41 +01:00
Daniel Hahler
b51c1c3b8d tests: fix equal_with_bash for .coverage files 
Fixes https://github.com/pytest-dev/pytest/issues/4162.
 2018-11-10 03:24:02 +01:00
Daniel Hahler
e14ca19988 Merge pull request #4352 from blueyed/_check_initialpaths_for_relpath 
Fix nodes._check_initialpaths_for_relpath for dirs
 2018-11-10 03:18:36 +01:00
Ronny Pfannschmidt
10d27f412b Merge pull request #4360 from blueyed/merge-master 
Merge master into features
 2018-11-09 17:26:40 +01:00
Daniel Hahler
bee72a6622 Fix nodes._check_initialpaths_for_relpath for dirs 
Ref: https://github.com/pytest-dev/pytest/issues/4321#issuecomment-436951894

Hardens some of the not many tests affected by this:

1. `testing/test_session.py::test_rootdir_option_arg` displayed:

> root/test_rootdir_option_arg2/test_rootdir_option_arg.py

2. `test_cmdline_python_namespace_package` displayed "hello/" prefix for:

> hello/test_hello.py::test_hello
> hello/test_hello.py::test_other
 2018-11-09 13:16:59 +01:00
Daniel Hahler
1b260a844f Merge branch 'master' into features 2018-11-09 12:49:55 +01:00
Bruno Oliveira
e00f3a2fb7 Merge pull request #4353 from blueyed/test_fileimport 
tests: test_fileimport: improve reporting on failure
 2018-11-09 08:32:49 -02:00
Daniel Hahler
b92530de78 Merge pull request #4271 from blueyed/pytest_cache 
cache_dir: use $TOX_ENV_DIR/ prefix if set
 2018-11-09 09:09:45 +01:00
Daniel Hahler
afaad2f82b Merge pull request #4354 from blueyed/minor 
A set of minor changes from my Git stashes
 2018-11-09 08:25:17 +01:00