floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,075 Commits 32 Branches 205 Tags 46 MiB
Commit Graph

12075 Commits

Author SHA1 Message Date
Bruno Oliveira c934de6e1b
Merge pull request #7354 from nicoddemus/backport-7352 
[5.4.x] Merge pull request #7352 from nicoddemus/lock-unlink-5456
 2020-06-12 10:13:46 -03:00
Bruno Oliveira 5ff9bf4ea0 Merge pull request #7352 from nicoddemus/lock-unlink-5456 
Suppress errors while removing tmpdir's lock files
 2020-06-12 08:54:09 -03:00
Bruno Oliveira 6702741978
Merge pull request #7306 from nicoddemus/backport-7242 
[5.4.x] Merge pull request #7242 from nicoddemus/fix-flaky-test
 2020-06-02 21:44:06 -03:00
Bruno Oliveira 03bf27f4df Merge pull request #7242 from nicoddemus/fix-flaky-test 
Introduce _pytest.timing as a way to control timing during internal tests

Conflicts:
  	src/_pytest/pytester.py
	  src/_pytest/runner.py
	  src/_pytest/terminal.py
  	testing/acceptance_test.py
 2020-06-02 20:39:00 -03:00
Bruno Oliveira 48f787ecff
Merge pull request #7301 from pytest-dev/release-5.4.3 
Prepare release 5.4.3
 2020-06-02 14:17:25 -03:00
pytest bot b322004047 Preparing release version 5.4.3 2020-06-02 15:22:35 +00:00
Bruno Oliveira 2d795dc07b
Merge pull request #7298 from nicoddemus/backport-6755 
[5.4.x] Fix removal of very long paths on Windows (#6755)
 2020-06-02 09:48:49 -03:00
Ran Benita 2d6b846978
Merge pull request #7299 from nicoddemus/backport-7294 
[5.4.x] Merge pull request #7294 from nicoddemus/codecov-adjustments
 2020-06-02 15:29:26 +03:00
Bruno Oliveira 703d0f50d8 Merge pull request #7294 from nicoddemus/codecov-adjustments 2020-06-02 09:02:48 -03:00
Tor Colvin 56e6482405 Fix removal of very long paths on Windows (#6755) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-06-02 08:58:01 -03:00
Bruno Oliveira 589176e9fe
Merge pull request #7285 from nicoddemus/backport-7220 
[5.4] Merge pull request #7220 from nicoddemus/issue-6428
 2020-05-30 21:00:53 -03:00
Bruno Oliveira 3734a27733
[5.4] Do not call TestCase.tearDown for skipped tests (#7236) (#7283) 
[5.4] Do not call TestCase.tearDown for skipped tests (#7236)
 2020-05-30 21:00:08 -03:00
Bruno Oliveira e1a21e46b0 Merge pull request #7220 from nicoddemus/issue-6428 2020-05-30 20:14:57 -03:00
Bruno Oliveira 551400e8d6 Do not call TestCase.tearDown for skipped tests (#7236) 
Fix #7215
 2020-05-30 14:34:45 -03:00
Anthony Sottile b7b729298c
Merge pull request #7271 from asottile/backport-7257 
[5.4.x] Merge pull request #7257 from DahlitzFlorian/fix-issue-6956
 2020-05-27 15:02:10 -07:00
Anthony Sottile 21ca38b932 Merge pull request #7257 from DahlitzFlorian/fix-issue-6956 
Prevent pytest from printing ConftestImportFailure traceback

(cherry picked from commit b3db440d4c)
 2020-05-27 13:52:10 -07:00
Anthony Sottile 565f4cb4ad
Merge pull request #7248 from asottile/backport-7244 
[5.4.x] Merge pull request #7244 from DahlitzFlorian/fix-issue-7150
 2020-05-23 12:45:35 -07:00
Anthony Sottile af6548a4e7 Merge pull request #7244 from DahlitzFlorian/fix-issue-7150 
Prevent hiding underlying exception when ConfTestImportFailure is raised

(cherry picked from commit 45f53266e6)
 2020-05-23 12:13:34 -07:00
Bruno Oliveira 2fb2962df4
Merge pull request #7193 from pytest-dev/release-5.4.2 2020-05-08 09:01:11 -03:00
pytest bot f838c7b7eb Preparing release version 5.4.2 2020-05-08 11:14:08 +00:00
Bruno Oliveira 25b53c4196
Merge pull request #7188 from asottile/backport_7179 2020-05-08 06:58:08 -03:00
Bruno Oliveira fc27171d57
Merge pull request #7189 from asottile/backport-7186 2020-05-08 06:57:25 -03:00
Anthony Sottile d18e426b24 Merge pull request #7186 from asottile/is_setup_py_encoding_agnostic 
Fix _is_setup_py for files encoded differently than locale
 2020-05-07 14:02:00 -07:00
Bruno Oliveira e83fa48dd1 Merge pull request #7179 from asottile/py39 2020-05-07 13:57:10 -07:00
Bruno Oliveira c53d52c3f2
Merge pull request #7174 from nicoddemus/backport-7168 2020-05-06 18:24:43 -03:00
Bruno Oliveira 3886c6d735 Merge pull request #7168 from nicoddemus/saferepr-getattr-fail-7145 2020-05-06 17:59:42 -03:00
Bruno Oliveira 80936b6762
Merge pull request #7156 from nicoddemus/backport-7151 2020-05-02 16:01:15 -03:00
Bruno Oliveira 5ca08e9b8a Merge pull request #7151 from nicoddemus/unittest-cleanup-6947 2020-05-02 15:44:39 -03:00
Bruno Oliveira ba2c49e71e
Merge pull request #7149 from nicoddemus/backport-7144 2020-05-01 17:08:55 -03:00
Bruno Oliveira da615a4fbe Merge pull request #7144 from nicoddemus/async-testcase-7110 2020-05-01 16:45:01 -03:00
Bruno Oliveira 32562881d4
Merge pull request #7146 from nicoddemus/backport-7143 2020-05-01 13:31:24 -03:00
Bruno Oliveira 2a0bbfe63f Merge pull request #7143 from nicoddemus/file-from-parent 2020-05-01 13:08:42 -03:00
Ronny Pfannschmidt 9aed656ec7
Merge pull request #7066 from RonnyPfannschmidt/backport-6992-restore-tmpdir-indirection 
backport #6992 to 5.4.x - restores tmpdir indirection
 2020-04-10 13:11:17 +02:00
Ronny Pfannschmidt a600e7a2a4
Merge pull request #7068 from RonnyPfannschmidt/backport-6927-run-async-unittest 
backport #6927: run async testcase methods
 2020-04-10 13:11:05 +02:00
Ronny Pfannschmidt 57a95b3a2c
Merge pull request #7067 from RonnyPfannschmidt/backport-6986-terminalreporter.writer 
backport #6986: writable TerminalWriter.writer for deprecation
 2020-04-10 11:25:42 +02:00
Ronny Pfannschmidt f5e430fd8f Merge pull request #6927 from RonnyPfannschmidt/fix-6924-run-async-stdlib-unittests 
running stdlib asyncio unittests again
 2020-04-10 08:16:58 +02:00
Ronny Pfannschmidt 38a4c7e56c Merge pull request #6986 from RonnyPfannschmidt/fix-6951-tw.writer-writable 
fix #6951: allow to write TerminalReporter.writer
 2020-04-10 08:12:34 +02:00
Ronny Pfannschmidt 40f02d72b0 Merge pull request #6992 from pytest-dev/revert-6767-tmpdir-cleanup-upstream 
Revert "tmpdir: clean up indirection via config for factories"
 2020-04-10 08:07:53 +02:00
Daniel Hahler 554f600fb4
Fix TerminalRepr instances to be hashable (#6988) (#7006) 
pytest-xdist assumes `ExceptionChainRepr` is hashable.

Fixes https://github.com/pytest-dev/pytest/issues/6925.
Fixes https://github.com/pytest-dev/pytest-xdist/issues/515.

(cherry picked from commit 20f6331afd)
 2020-04-03 10:59:23 +02:00
Ran Benita e3a3c90d94
[5.4.x] Fix crash when printing while capsysbinary is active (#7002) 
Backport of 1fda861190 from master.
 2020-04-02 14:31:32 +03:00
Ran Benita f7327759e8 ci: twisted and oldattrs tox envs are now incompatible, don't run them together 
twisted started to use `attr.s(eq)` argument which was added recently,
so it fails with oldattrs. One of the CI jobs ran twisted and oldattrs
together, so it started to fail.

Move the twisted code to be covered by another job, and remove it from
the job with the oldattrs.

(cherry picked from commit 2cc3227f6a)
 2020-03-31 09:48:11 +02:00
Bruno Oliveira ee1950af77
Merge pull request #6918 from pytest-dev/release-5.4.1 
Prepare release 5.4.1
 2020-03-13 11:11:05 -03:00
pytest bot 3d0f3baa2b Preparing release version 5.4.1 2020-03-13 13:34:24 +00:00
Bruno Oliveira 8da758b93a
Merge pull request #6917 from nicoddemus/backport-6916 
[Backport] Skip link checks when doing releases through the bot (#6916)
 2020-03-13 10:34:10 -03:00
Bruno Oliveira 59e5d1bfbf Merge pull request #6916 from nicoddemus/no-link-checks 
Skip link checks when doing releases through the bot
 2020-03-13 10:32:25 -03:00
Bruno Oliveira b9e2cd0a81
Merge pull request #6914 from nicoddemus/revert-6330 
Revert "[parametrize] enforce explicit argnames declaration (#6330)"
 2020-03-13 10:18:06 -03:00
Bruno Oliveira a84fcbf5b2 Revert "[parametrize] enforce explicit argnames declaration (#6330)" 
This reverts commit 9e262038c8.

Fix #6909
 2020-03-13 09:59:53 -03:00
Bruno Oliveira 59c1bfada7
Merge pull request #6913 from nicoddemus/backport-6910 
[Backport #6910] Handle unknown stats in pytest_report_teststatus hook
 2020-03-13 09:48:11 -03:00
Bruno Oliveira 3267f64724 Merge pull request #6910 from nicoddemus/resultlog-logreport 
Handle unknown stats in pytest_report_teststatus hook
 2020-03-13 09:30:14 -03:00
pytest bot c9fd1bdbd6 Preparing release version 5.4.0 2020-03-12 14:14:35 +00:00