diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-25 23:12:46 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-25 23:12:46 +0100 |
| commit | 804ee5934b4dbcb3a76ba556f62cac1554e8be36 (patch) | |
| tree | c8ce98a4bd6946708b587b30beb48914c1f9ebd1 | |
| parent | 8c8736b2c81ef0fb0fdca95a2a942bc2259d5940 (diff) | |
| download | psutil-804ee5934b4dbcb3a76ba556f62cac1554e8be36.tar.gz | |
attemp to fix osx + travis failure
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | psutil/tests/__init__.py | 6 | ||||
| -rw-r--r-- | psutil/tests/test_process.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 8d5a50ba..133332d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ sudo: false language: python +os: + - linux + - osx matrix: include: - python: 2.6 diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 8fa2dd11..7ff5133f 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -486,9 +486,9 @@ def retry_before_failing(ntimes=None): for x in range(times): try: return fun(*args, **kwargs) - except AssertionError: - pass - raise + except AssertionError as _: + err = _ + raise err return wrapper return decorator diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index 0fc27940..176c19a4 100644 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -553,6 +553,8 @@ class TestProcess(unittest.TestCase): thread.stop() @retry_before_failing() + # see: https://travis-ci.org/giampaolo/psutil/jobs/111842553 + @unittest.skipIf(OSX and TRAVIS, "") def test_threads_2(self): p = psutil.Process() if OPENBSD: |