merge from master371-temperatures

1 files changed, 4 insertions, 3 deletions

diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index 31d4c3fb..79ae6bba 100755
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -112,7 +112,7 @@ class TestSystemAPIs(unittest.TestCase):
         gone, alive = test(procs, callback)
         self.assertIn(sproc3.pid, [x.pid for x in gone])
         if POSIX:
-            self.assertEqual(gone.pop().returncode, signal.SIGTERM)
+            self.assertEqual(gone.pop().returncode, -signal.SIGTERM)
         else:
             self.assertEqual(gone.pop().returncode, 1)
         self.assertEqual(l, [sproc3.pid])
@@ -710,9 +710,10 @@ class TestSystemAPIs(unittest.TestCase):
                     self.assertGreaterEqual(value, 0)
 
         ls = psutil.cpu_freq(percpu=True)
-        if not TRAVIS:
-            assert ls, ls
+        if TRAVIS and not ls:
+            return
 
+        assert ls, ls
         check_ls([psutil.cpu_freq(percpu=False)])
 
         if LINUX: