Remove scancode refs that are not needed #2233

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

Author: pombredanne

tests/extractcode/test_archive.py

@@ -298,20 +298,20 @@ def test_no_handler_is_selected_for_a_non_archive3(self):
 
     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, ie the scancode-toolkit/ 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
         import tempfile
         import shutil
         from extractcode.sevenzip import extract
 
         test_file = self.get_test_loc('archive/relative_path/basic.zip', copy=True)
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
-        test_tgt_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
+        test_tgt_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'basic.zip')
         result = list(extract(test_src_file, test_tgt_dir))
@@ -1702,7 +1702,7 @@ def test_extract_twice_with_rpm_with_xz_compressed_cpio(self):
 
     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, ie the scancode-toolkit/ 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
         import shutil
@@ -1712,12 +1712,12 @@ def test_extract_twice_can_extract_to_relative_paths(self):
         # this will return an extractor that extracts twice
         extractor = archive.get_extractor(test_file)
 
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
-        test_tgt_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
+        test_tgt_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'xz-compressed-cpio.rpm')
 

tests/extractcode/test_extract.py

@@ -795,20 +795,21 @@ def test_walk_can_be_extended_while_walking(self):
 
     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, ie the scancode-toolkit/ 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
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
+        import shutil
         import tempfile
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         test_file = self.get_test_loc('extract/relative_path/basic.zip')
-        import shutil
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'basic.zip')
-        test_tgt_dir = join(scancode_root, test_src_file) + extractcode.EXTRACT_SUFFIX
+        test_tgt_dir = join(project_root, test_src_file) + extractcode.EXTRACT_SUFFIX
         result = list(extract.extract(test_src_file))
         expected = ['c/a/a.txt', 'c/b/a.txt', 'c/c/a.txt']
         check_files(test_tgt_dir, expected)

tests/extractcode/test_extractcode_cli.py

@@ -96,7 +96,7 @@ def test_extractcode_command_always_shows_something_if_not_using_a_tty_verbose_o
 
 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, ie the scancode-toolkit/ 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  commoncode import fileutils
@@ -105,15 +105,15 @@ def test_extractcode_command_works_with_relative_paths(monkeypatch):
     import shutil
 
     try:
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         test_file = test_env.get_test_loc('cli/extract_relative_path/basic.zip')
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'basic.zip')
-        test_tgt_dir = join(scancode_root, test_src_file) + extractcode.EXTRACT_SUFFIX
+        test_tgt_dir = join(project_root, test_src_file) + extractcode.EXTRACT_SUFFIX
 
         runner = CliRunner()
         monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
@@ -131,19 +131,19 @@ def test_extractcode_command_works_with_relative_paths(monkeypatch):
 
 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, ie the scancode-toolkit/ 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  commoncode import fileutils
     import tempfile
     import shutil
 
     try:
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         test_file = test_env.get_test_loc('cli/extract_relative_path/basic.zip')
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'basic.zip')

tests/extractcode/test_libarchive2.py

@@ -40,20 +40,20 @@ class TestExtractorTest(BaseArchiveTestCase):
 
     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, ie the scancode-toolkit/ 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
         import tempfile
         import shutil
         from extractcode.libarchive2 import extract
 
         test_file = self.get_test_loc('archive/relative_path/basic.zip')
-        scancode_root = dirname(dirname(dirname(__file__)))
-        scancode_tmp = join(scancode_root, 'tmp')
-        fileutils.create_dir(scancode_tmp)
-        scancode_root_abs = abspath(scancode_root)
-        test_src_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
-        test_tgt_dir = tempfile.mkdtemp(dir=scancode_tmp).replace(scancode_root_abs, '').strip('\\/')
+        project_root = dirname(dirname(dirname(__file__)))
+        project_tmp = join(project_root, 'tmp')
+        fileutils.create_dir(project_tmp)
+        project_root_abs = abspath(project_root)
+        test_src_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
+        test_tgt_dir = tempfile.mkdtemp(dir=project_tmp).replace(project_root_abs, '').strip('\\/')
         shutil.copy(test_file, test_src_dir)
         test_src_file = join(test_src_dir, 'basic.zip')
         result = list(extract(test_src_file, test_tgt_dir))