unittest: move definition of data base dir to utils package

Christian Herdtweck
1 parent f2d2fe46
Showing 3 changed files with 11 additions and 14 deletions
tests/json/test_output.py
tests/msodde_doc/test_basic.py
tests/test_utils/__init__.py
@@ -9,9 +9,9 @@ import unittest
 import sys
 import json
 import os
-from os.path import join, dirname, normpath
+from os.path import join
 from oletools import msodde
-from tests.test_utils import OutputCapture
+from tests.test_utils import OutputCapture, DATA_BASE_DIR
 if sys.version_info[0] <= 2:
     from oletools import olevba
@@ -19,16 +19,12 @@ else:
     from oletools import olevba3 as olevba
-# Directory with test data, independent of current working directory
-DATA_DIR = normpath(join(dirname(__file__), '..', 'test-data'))
-
-
 class TestValidJson(unittest.TestCase):
     """ Ensure that script output is valid json (if return code is 0) """
     def iter_test_files(self):
-        """ Iterate over all test files in DATA_DIR """
-        for dirpath, _, filenames in os.walk(DATA_DIR):
+        """ Iterate over all test files in DATA_BASE_DIR """
+        for dirpath, _, filenames in os.walk(DATA_BASE_DIR):
             for filename in filenames:
                 yield join(dirpath, filename)
@@ -10,16 +10,12 @@ from __future__ import print_function
 import unittest
 from oletools import msodde
-from tests.test_utils import OutputCapture
+from tests.test_utils import OutputCapture, DATA_BASE_DIR as BASE_DIR
 import shlex
-from os.path import join, dirname, normpath
+from os.path import join
 from traceback import print_exc
-# base directory for test input
-BASE_DIR = normpath(join(dirname(__file__), '..', 'test-data'))
-
-
 class TestReturnCode(unittest.TestCase):
     def test_valid_doc(self):
 from .output_capture import OutputCapture
+
+from os.path import dirname, join
+
+# Directory with test data, independent of current working directory
+DATA_BASE_DIR = join(dirname(dirname(__file__)), 'test-data')