summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-18 20:43:57 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-18 20:43:57 +0200
commitde3aa8d54a14a50b274d741cfe5203c8c326c569 (patch)
tree68cf42c30abd100046a195a1e4e0f34ac7d50ba7
parent1024bb4ce524200e9e35bc0ea17d006f5f8101cd (diff)
downloadpsutil-de3aa8d54a14a50b274d741cfe5203c8c326c569.tar.gz
remove useless posix cwd test
-rwxr-xr-xpsutil/tests/test_misc.py3
-rwxr-xr-xpsutil/tests/test_posix.py6
2 files changed, 2 insertions, 7 deletions
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index 57423dd8..f9459d30 100755
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -39,6 +39,7 @@ from psutil.tests import DEVNULL
from psutil.tests import get_free_port
from psutil.tests import get_test_subprocess
from psutil.tests import HAS_BATTERY
+from psutil.tests import HAS_CONNECTIONS_UNIX
from psutil.tests import HAS_MEMORY_FULL_INFO
from psutil.tests import HAS_MEMORY_MAPS
from psutil.tests import HAS_SENSORS_BATTERY
@@ -1006,7 +1007,7 @@ class TestNetUtils(unittest.TestCase):
types[s.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE)] += 1
self.assertGreaterEqual(fams[socket.AF_INET], 2)
self.assertGreaterEqual(fams[socket.AF_INET6], 2)
- if POSIX:
+ if POSIX and HAS_CONNECTIONS_UNIX:
self.assertGreaterEqual(fams[socket.AF_UNIX], 2)
self.assertGreaterEqual(types[socket.SOCK_STREAM], 2)
self.assertGreaterEqual(types[socket.SOCK_DGRAM], 2)
diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
index f810a09e..54f886d8 100755
--- a/psutil/tests/test_posix.py
+++ b/psutil/tests/test_posix.py
@@ -248,12 +248,6 @@ class TestProcess(unittest.TestCase):
if failures:
self.fail('\n' + '\n'.join(failures))
- @unittest.skipIf(not os.path.islink("/proc/%s/cwd" % os.getpid()),
- "/proc fs not available")
- def test_cwd(self):
- self.assertEqual(os.readlink("/proc/%s/cwd" % os.getpid()),
- psutil.Process().cwd())
-
@unittest.skipIf(not POSIX, "POSIX only")
class TestSystemAPIs(unittest.TestCase):