Merge pull request #114249 from veprbl/pr/psutil_test_fix
This commit is contained in:
commit
9f7ce23482
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
|
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
|
||||||
, darwin
|
, darwin
|
||||||
, pytest
|
, pytestCheckHook
|
||||||
, mock
|
, mock
|
||||||
, ipaddress
|
, ipaddress
|
||||||
, unittest2
|
, unittest2
|
||||||
|
@ -18,15 +18,20 @@ buildPythonPackage rec {
|
||||||
# arch doesn't report frequency is the same way
|
# arch doesn't report frequency is the same way
|
||||||
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
|
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
|
||||||
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
|
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
|
||||||
checkInputs = [ pytest ]
|
checkInputs = [ pytestCheckHook ]
|
||||||
++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
|
++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
|
||||||
# out must be referenced as test import paths are relative
|
pytestFlagsArray = [
|
||||||
|
"$out/${python.sitePackages}/psutil/tests/test_system.py"
|
||||||
|
];
|
||||||
# disable tests which don't work in sandbox
|
# disable tests which don't work in sandbox
|
||||||
# cpu_times is flakey on darwin
|
# cpu_times is flakey on darwin
|
||||||
checkPhase = ''
|
disabledTests = [
|
||||||
pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
|
"user"
|
||||||
-k 'not user and not disk_io_counters and not sensors_battery and not cpu_times'
|
"disk_io_counters"
|
||||||
'';
|
"sensors_battery"
|
||||||
|
"cpu_times"
|
||||||
|
"cpu_freq"
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
|
buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue