summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2017-05-29 06:57:29 +0200
committernicolargo <nicolas@nicolargo.com>2017-05-30 21:24:44 +0200
commit233ebc9608a7b193f2d93e8b4068ad53aa4e7685 (patch)
tree8df48e8f848c7c4391583019e484d8b3e5b32786
parent8e3241bab13cc19d838d806698139683add4f6ad (diff)
Correct Travis IC
(cherry picked from commit 5b3b7984e7df449d8b18d24033d1e0b1636e6e0f)
-rw-r--r--glances/compat.py5
-rwxr-xr-xunitest.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/glances/compat.py b/glances/compat.py
index f11ce3ca..83f1925d 100644
--- a/glances/compat.py
+++ b/glances/compat.py
@@ -25,7 +25,12 @@ import operator
import sys
import unicodedata
import types
+import platform
+PY_CYTHON = platform.python_implementation() == 'CPython'
+PY_PYPY = platform.python_implementation() == 'PyPy'
+PY_JYTHON = platform.python_implementation() == 'Jython'
+PY_IRON = platform.python_implementation() == 'IronPython'
PY3 = sys.version_info[0] == 3
try:
diff --git a/unitest.py b/unitest.py
index a612480c..3e6ebf2b 100755
--- a/unitest.py
+++ b/unitest.py
@@ -28,7 +28,7 @@ from glances.stats import GlancesStats
from glances import __version__
from glances.globals import WINDOWS, LINUX
from glances.outputs.glances_bars import Bar
-from glances.compat import PY3
+from glances.compat import PY3, PY_PYPY
from glances.thresholds import GlancesThresholdOk
from glances.thresholds import GlancesThresholdCareful
from glances.thresholds import GlancesThresholdWarning
@@ -212,6 +212,7 @@ class TestGlances(unittest.TestCase):
print('INFO: GPU stats: %s' % stats_grab)
@unittest.skipIf(PY3, True)
+ @unittest.skipIf(PY_PYPY, True)
def test_094_thresholds(self):
"""Test thresholds classes"""
print('INFO: [TEST_094] Thresholds')