Adjust test file paths

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

tests/test_archive.py

@@ -57,6 +57,7 @@
  - password-protected when supported
 """
 
+project_root = os.path.dirname(os.path.dirname(__file__))
 
 class TestGetExtractorTest(BaseArchiveTestCase):
 
@@ -287,13 +288,13 @@ def test_7zip_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, i.e. the git checkout dir.
         # To use relative paths, we use our tmp dir at the root of the code tree
-        from os.path import dirname, join, abspath
+        from os.path import join, abspath
         import tempfile
         import shutil
         from extractcode.sevenzip import extract
 
         test_file = self.get_test_loc('archive/relative_path/basic.zip', copy=True)
-        project_root = dirname(dirname(dirname(__file__)))
+        
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)
@@ -1648,15 +1649,14 @@ def test_extract_twice_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, i.e. the git checkout dir
         # To use relative paths, we use our tmp dir at the root of the code tree
-        from os.path import dirname, join, abspath, exists
+        from os.path import join, abspath, exists
         import shutil
         import tempfile
 
         test_file = self.get_test_loc('archive/rpm/xz-compressed-cpio.rpm')
         # this will return an extractor that extracts twice
         extractor = archive.get_extractor(test_file)
 
-        project_root = dirname(dirname(dirname(__file__)))
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)

tests/test_extract.py

@@ -37,6 +37,8 @@
 from extractcode_assert_utils import check_no_error
 from extractcode_assert_utils import BaseArchiveTestCase
 
+project_root = os.path.dirname(os.path.dirname(__file__))
+
 
 class TestExtract(BaseArchiveTestCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -789,11 +791,10 @@ def test_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, i.e. the git checkout dir
         # To use relative paths, we use our tmp dir at the root of the code tree
-        from os.path import dirname, join, abspath
+        from os.path import join, abspath
         import shutil
         import tempfile
 
-        project_root = dirname(dirname(dirname(__file__)))
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)

tests/test_extractcode_cli.py

@@ -35,6 +35,8 @@
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
+project_root = os.path.dirname(os.path.dirname(__file__))
+
 
 """
 These CLI tests are dependent on py.test monkeypatch to  ensure we are testing
@@ -86,14 +88,13 @@ def test_extractcode_command_works_with_relative_paths(monkeypatch):
     # The setup is a tad complex because we want to have a relative dir
     # to the base dir where we run tests from, i.e. the git checkout  dir
     # To use relative paths, we use our tmp dir at the root of the code tree
-    from os.path import dirname, join, abspath
+    from os.path import join, abspath
     from  commoncode import fileutils
     import extractcode
     import tempfile
     import shutil
 
     try:
-        project_root = dirname(dirname(dirname(__file__)))
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)
@@ -121,13 +122,12 @@ def test_extractcode_command_works_with_relative_paths_verbose(monkeypatch):
     # The setup is a tad complex because we want to have a relative dir
     # to the base dir where we run tests from, i.e. the git checkout dir
     # To use relative paths, we use our tmp dir at the root of the code tree
-    from os.path import dirname, join, abspath
+    from os.path import join, abspath
     from  commoncode import fileutils
     import tempfile
     import shutil
 
     try:
-        project_root = dirname(dirname(dirname(__file__)))
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)

tests/test_libarchive2.py

@@ -18,12 +18,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+import os
 
 from commoncode import fileutils
 
 from extractcode_assert_utils import check_files
 from extractcode_assert_utils import BaseArchiveTestCase
 
+project_root = os.path.dirname(os.path.dirname(__file__))
+
 """
 Minimal smoke tests for libarchive2.
 """
@@ -35,13 +38,12 @@ def test_libarchive_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, i.e. the git checkout dir
         # To use relative paths, we use our tmp dir at the root of the code tree
-        from os.path import dirname, join, abspath
+        from os.path import join, abspath
         import tempfile
         import shutil
         from extractcode.libarchive2 import extract
 
         test_file = self.get_test_loc('archive/relative_path/basic.zip')
-        project_root = dirname(dirname(dirname(__file__)))
         project_tmp = join(project_root, 'tmp')
         fileutils.create_dir(project_tmp)
         project_root_abs = abspath(project_root)