fix various tests

5 files changed, 16 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index b14978b2..4baa23b2 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ test-posix:  ## POSIX specific tests.
 
 test-platform:  ## Run specific platform tests only.
 	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
+	$(TEST_PREFIX) $(PYTHON) psutil.tests.test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
 
 test-memleaks:  ## Memory leak tests.
 	${MAKE} install
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
index bba3a2ba..eccc96a1 100644
--- a/psutil/_psbsd.py
+++ b/psutil/_psbsd.py
@@ -781,7 +781,6 @@ class Process(object):
         ret = []
         for item in rawlist:
             fd, fam, type, laddr, raddr, status = item
-            status = TCP_STATUSES[status]
             nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
                                 TCP_STATUSES)
             ret.append(nt)
diff --git a/psutil/tests/test_bsd.py b/psutil/tests/test_bsd.py
index e769b727..6c3f6e52 100755
--- a/psutil/tests/test_bsd.py
+++ b/psutil/tests/test_bsd.py
@@ -253,7 +253,10 @@ class FreeBSDSpecificTestCase(unittest.TestCase):
         # Currently only cpu 0 is frequency is supported in FreeBSD
         # All other cores use the same frequency.
         sensor = "dev.cpu.0.freq"
-        sysctl_result = int(sysctl(sensor))
+        try:
+            sysctl_result = int(sysctl(sensor))
+        except RuntimeError:
+            self.skipTest("frequencies not supported by kernel")
         self.assertEqual(psutil.cpu_freq().current, sysctl_result)
 
         sensor = "dev.cpu.0.freq_levels"
@@ -450,7 +453,10 @@ class FreeBSDSpecificTestCase(unittest.TestCase):
         for cpu in range(num_cpus):
             sensor = "dev.cpu.%s.temperature" % cpu
             # sysctl returns a string in the format 46.0C
-            sysctl_result = int(float(sysctl(sensor)[:-1]))
+            try:
+                sysctl_result = int(float(sysctl(sensor)[:-1]))
+            except RuntimeError:
+                self.skipTest("temperatures not supported by kernel")
             self.assertAlmostEqual(
                 psutil.sensors_temperatures()["coretemp"][cpu].current,
                 sysctl_result, delta=10)
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index 6f923bed..4b688288 100755
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -766,11 +766,15 @@ class TestScripts(unittest.TestCase):
     @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
     @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
     def test_temperatures(self):
+        if not psutil.sensors_temperatures():
+            self.skipTest("no temperatures")
         self.assert_stdout('temperatures.py')
 
     @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
     @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
     def test_fans(self):
+        if not psutil.sensors_fans():
+            self.skipTest("no fans")
         self.assert_stdout('fans.py')
 
     @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index 512a8437..ae3388a1 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -24,6 +24,7 @@ import psutil
 
 from psutil import AIX
 from psutil import BSD
+from psutil import FREEBSD
 from psutil import LINUX
 from psutil import MACOS
 from psutil import NETBSD
@@ -1084,7 +1085,8 @@ class TestProcess(unittest.TestCase):
         self.assertEqual(p1.parents()[0], psutil.Process())
         self.assertEqual(p2.parents()[0], p1)
         self.assertEqual(p2.parents()[1], psutil.Process())
-        if POSIX:
+        if POSIX and not FREEBSD:
+            # On FreeBSD PID 1 has an older/smaller time than PID 0 (?)
             lowest_pid = psutil.pids()[0]
             self.assertEqual(p1.parents()[-1].pid, lowest_pid)
             self.assertEqual(p2.parents()[-1].pid, lowest_pid)