diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-04-24 10:35:13 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-04-24 10:35:13 +0200 |
| commit | 10d6950d9cd4c1fcc4b913c768a51f3a53bbac21 (patch) | |
| tree | d43f114bd74f4bd7b2e5c7163070cac4fd27158b | |
| parent | bdb6e7b52d625097ef82742e9647532d3ec7eac4 (diff) | |
| download | psutil-10d6950d9cd4c1fcc4b913c768a51f3a53bbac21.tar.gz | |
skip scripts test if can't locate directory
May happen on CI and when running tests via "python -m psutil.tests"
since scripts dir is not installed.
| -rwxr-xr-x | psutil/tests/test_misc.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index ca0a0433..74a0c427 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -42,7 +42,6 @@ from psutil.tests import reload_module from psutil.tests import ROOT_DIR from psutil.tests import SCRIPTS_DIR from psutil.tests import sh -from psutil.tests import TOX from psutil.tests import TRAVIS from psutil.tests import unittest import psutil @@ -624,9 +623,7 @@ class TestWrapNumbers(unittest.TestCase): # =================================================================== -@unittest.skipIf(TOX, "can't test on TOX") -# See: https://travis-ci.org/giampaolo/psutil/jobs/295224806 -@unittest.skipIf(TRAVIS and not os.path.exists(SCRIPTS_DIR), +@unittest.skipIf(not os.path.exists(SCRIPTS_DIR), "can't locate scripts directory") class TestScripts(unittest.TestCase): """Tests for scripts in the "scripts" directory.""" |