update test to get external file more flexible

Author: mr-c

MANIFEST.in

@@ -1,5 +1,6 @@
-include Makefile
-global-exclude *~
-global-exclude *.pyc
+include Makefile gittaggers.py
 include tests/*
 include tests/test-data/*
+global-exclude *~
+global-exclude *.pyc
+

setup.cfg

@@ -8,3 +8,6 @@ universal = 1
 
 [tool:pytest]
 testpaths = tests
+
+[aliases]
+test=pytest

tests/test_compare.py

@@ -1,26 +1,18 @@
 import unittest
+from .util import get_data
 from cwltest import CompareFail
 from cwltest.utils import compare_file, compare
 
 
-class TestCompare(unittest.TestCase):
-
-    def compare_success(self, expected, actual):
-        try:
-            compare(expected, actual)
-        except CompareFail:
-            self.fail("Comparison failed unexpectedly")
-
-
-class TestCompareFile(TestCompare):
+class TestCompareFile(unittest.TestCase):
 
     def test_compare_file(self):
         expected = {
             "location": "cores.txt",
             "size": 2,
             "class": "File",
             "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a"
-         }
+        }
 
         actual = {
             "basename": "cores.txt",
@@ -48,10 +40,10 @@ def test_compare_contents_success(self):
             "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
             "class": "File",
             "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "path": "tests/test-data/cores.txt",
+            "path": get_data("tests/test-data/cores.txt"),
             "size": 2
         }
-        self.compare_success(expected, actual)
+        compare(expected, actual)
 
     def test_compare_contents_failure(self):
         expected = {
@@ -66,7 +58,7 @@ def test_compare_contents_failure(self):
             "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
             "class": "File",
             "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "path": "tests/test-data/cores.txt",
+            "path": get_data("tests/test-data/cores.txt"),
             "size": 2
         }
         with self.assertRaises(CompareFail):

tests/util.py

@@ -0,0 +1,19 @@
+from __future__ import absolute_import
+import os
+
+from pkg_resources import (Requirement, ResolutionError,  # type: ignore
+                           resource_filename)
+
+
+def get_data(filename):
+    filename = os.path.normpath(
+        filename)  # normalizing path depending on OS or else it will cause problem when joining path
+    filepath = None
+    try:
+        filepath = resource_filename(
+            Requirement.parse("cwltest"), filename)
+    except ResolutionError:
+        pass
+    if not filepath or not os.path.isfile(filepath):
+        filepath = os.path.join(os.path.dirname(__file__), os.pardir, filename)
+    return filepath

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 #envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
-envlist = py27-lint, py27-unit, py35-mypy{2,3}
+envlist = py27-lint, py{27,33,34,35}-unit, py35-mypy{2,3}
 skipsdist = True
 
 [travis]
@@ -12,7 +12,9 @@ python =
   3.5: py35-mypy{2,3}
 
 [testenv]
-deps = -rrequirements.txt
+deps =
+  pytest
+  -rrequirements.txt
 
 [testenv:py35-mypy2]
 commands = make mypy2
@@ -49,13 +51,14 @@ whitelist_externals = flake8
 deps = flake8
 
 [testenv:py35-unit]
-commands = python setup.py test
+commands = pytest {posargs} # substitute with tox' positional arguments
 
 [testenv:py34-unit]
-commands = python setup.py test
+commands = pytest {posargs} # substitute with tox' positional arguments
 
 [testenv:py33-unit]
-commands = python setup.py test
+commands = pytest {posargs} # substitute with tox' positional arguments
 
 [testenv:py27-unit]
-commands = python setup.py test
+commands = pytest {posargs} # substitute with tox' positional arguments
+