From 0cfab53dfd3a79c727c90025687f3f7d5cc7de7a Mon Sep 17 00:00:00 2001 From: Rok Roskar Date: Fri, 12 May 2017 16:25:46 +0200 Subject: [PATCH] fix handling of file not found --- tests/test_sparkjob.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/test_sparkjob.py b/tests/test_sparkjob.py index ee19e53..f2134b9 100644 --- a/tests/test_sparkjob.py +++ b/tests/test_sparkjob.py @@ -1,6 +1,12 @@ import pytest import os import sparkhpc +import sys + +if sys.version_info.major == 2: + fnfe = (OSError, IOError) +elif sys.version_info.major == 3: + fnfe = FileNotFoundError def find_bindir(): for root, subdirs, files in os.walk('.'): @@ -17,6 +23,8 @@ def find_bindir(): INFO:sparkhpc.sparkjob:[start_cluster] master running at spark://1.1.1.1:7077 INFO:sparkhpc.sparkjob:[start_cluster] master UI available at http://1.1.1.1:8080""" + + @pytest.fixture(autouse=True) def change_homedir(monkeypatch): monkeypatch.setattr(os.path, 'expanduser', lambda user: testdir) @@ -44,7 +52,7 @@ def sj(monkeypatch, request): try: os.remove(os.path.join(testdir,'.sparkhpc1')) - except FileNotFoundError: + except fnfe: pass def test_job_submission(sj): @@ -98,7 +106,7 @@ def test_jobid_start(sj): assert(sj.master_ui()) == 'http://1.1.1.1:8080' # this should fail - with pytest.raises(FileNotFoundError): + with pytest.raises(fnfe): sj2 = sj.__class__(jobid=100)