Merge branch 'master' into staging

With resolved conflicts in:
	gnu/local.mk
	gnu/packages/freedesktop.scm
	gnu/packages/gnuzilla.scm
This commit is contained in:
Maxim Cournoyer 2022-09-15 10:20:32 -04:00
commit 3d297a0017
No known key found for this signature in database
GPG key ID: 1260E46482E63562
118 changed files with 6730 additions and 4851 deletions

View file

@ -4984,12 +4984,17 @@ hard or impossible to fix in cssselect.")
;; The tests are prone to get stuck. Use pytest-timeouts --timeout
;; flag to get a meaningful idea about where.
(invoke "pytest" "-vv" "--timeout=300"
"-k" ,(string-append
"--timeout-method=thread"
"-k" (string-append
;; Timeout, because SIGINT cannot be sent to child.
"not test_signals_sigint_pycode_continue "
"and not test_signals_sigint_pycode_stop "
"and not test_signals_sigint_uvcode "
"and not test_signals_sigint_uvcode_two_loop_runs "
;; This test is racy and prone to get stuck on
;; various platforms, possibly a aiohttp issue:
;; https://github.com/MagicStack/uvloop/issues/412
"and not test_remote_shutdown_receives_trailing_data "
;; It looks like pytest is preventing
;; custom stdout/stderr redirection,
;; even with -s.