Improve test expected failures

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

Author: pombredanne

tests/extractcode/test_archive.py

@@ -19,16 +19,16 @@
 # limitations under the License.
 #
 
-import io
 import os
 
 import pytest
 
-import commoncode.date
+from commoncode import date as commoncode_date
 from commoncode import fileutils
 from commoncode.system import on_linux
 from commoncode.system import on_mac
 from commoncode.system import on_windows
+from commoncode.testcase import is_same
 
 from extractcode_assert_utils import BaseArchiveTestCase
 from extractcode_assert_utils import check_files
@@ -40,7 +40,6 @@
 from extractcode import ExtractErrorFailedToExtract
 from extractcode import libarchive2
 from extractcode import sevenzip
-from extractcode.libarchive2 import ArchiveError
 
 """
 For each archive type --when possible-- we are testing extraction of:
@@ -383,7 +382,7 @@ def test_extract_targz_with_trailing_data2(self):
         test_dir2 = self.get_temp_dir()
         test_file2 = self.get_test_loc('archive/tgz/no_trailing.tar.gz')
         archive.extract_tar(test_file2, test_dir2)
-        assert commoncode.testcase.is_same(test_dir1, test_dir2)
+        assert is_same(test_dir1, test_dir2)
 
     def test_extract_targz_with_mixed_case_and_symlink(self):
         test_file = self.get_test_loc('archive/tgz/mixed_case_and_symlink.tgz')
@@ -960,7 +959,7 @@ def test_extract_zip_with_timezone(self):
         ]
         # DST sends a monkey wrench.... so we only test the date, not the time
         for loc, expected_date in expected:
-            result = commoncode.date.get_file_mtime(loc)
+            result = commoncode_date.get_file_mtime(loc)
             assert result.startswith(expected_date)
 
     def test_extract_zip_with_timezone_2(self):
@@ -974,7 +973,7 @@ def test_extract_zip_with_timezone_2(self):
             (os.path.join(test_dir, 'primes2.txt'), ('2009-12-05', '2009-12-06',))
         ]
         for loc, expected_date in expected:
-            result = commoncode.date.get_file_mtime(loc)
+            result = commoncode_date.get_file_mtime(loc)
             assert result.startswith(expected_date)
 
     def test_extract_zip_with_backslash_in_path_1(self):
@@ -1268,7 +1267,7 @@ def test_extract_ar_verify_dates(self):
         ]
         # DST sends a monkey wrench.... so we only test the date, not the time
         for loc, expected_date in expected:
-            result = commoncode.date.get_file_mtime(loc)
+            result = commoncode_date.get_file_mtime(loc)
             assert result.startswith(expected_date)
 
     def test_extract_ar_broken_7z(self):
@@ -2318,7 +2317,7 @@ def test_extract_ar_with_weird_filenames_with_libarchive_win(self):
             self.check_extract_weird_names(
                 libarchive2.extract, test_file, expected_warnings=[], expected_suffix='libarch')
             self.fail('Exception not raised.')
-        except ArchiveError as ae:
+        except libarchive2.ArchiveError as ae:
             assert str(ae).startswith('Incorrect file header signature')
 
     def test_extract_cpio_with_weird_filenames_with_libarchive_win(self):

tests/extractcode/test_sevenzip.py

@@ -21,11 +21,12 @@
 import os
 import json
 import posixpath
-from unittest.case import skipIf
 
+import pytest
+
+from commoncode import fileutils
 from commoncode.testcase import FileBasedTesting
 from commoncode.system import on_windows
-from commoncode import fileutils
 
 from extractcode import ExtractErrorFailedToExtract
 from extractcode import sevenzip
@@ -135,7 +136,7 @@ def test_extract_of_tar_with_aboslute_path(self):
 
 class TestSevenZipListEntries(TestSevenZip):
 
-    @skipIf(on_windows, 'Windows file-by-file extracton is not working well')
+    @pytest.mark.skipif(on_windows, reason='Windows file-by-file extracton is not working well')
     def test_list_entries_of_special_tar(self):
         test_loc = self.get_test_loc('sevenzip/special.tar')
         expected_loc = test_loc + '-entries-expected.json'
@@ -145,7 +146,7 @@ def test_list_entries_of_special_tar(self):
         results = entries + errors
         self.check_results_with_expected_json(results, expected_loc, regen=False)
 
-    @skipIf(not on_windows, 'Windows file-by-file extracton is not working well')
+    @pytest.mark.skipif(not on_windows, reason='Windows file-by-file extracton is not working well')
     def test_list_entries_of_special_tar_win(self):
         test_loc = self.get_test_loc('sevenzip/special.tar')
         expected_loc = test_loc + '-entries-expected-win.json'
@@ -155,7 +156,7 @@ def test_list_entries_of_special_tar_win(self):
         results = entries + errors
         self.check_results_with_expected_json(results, expected_loc, clean_dates=True, regen=False)
 
-    @skipIf(on_windows, 'Windows file-by-file extracton is not working well')
+    @pytest.mark.skipif(on_windows, reason='Windows file-by-file extracton is not working well')
     def test_list_entries_with_weird_names_7z(self):
         test_loc = self.get_test_loc('sevenzip/weird_names.7z')
         expected_loc = test_loc + '-entries-expected.json'
@@ -165,7 +166,7 @@ def test_list_entries_with_weird_names_7z(self):
         results = entries + errors
         self.check_results_with_expected_json(results, expected_loc, regen=False)
 
-    @skipIf(not on_windows, 'Windows file-by-file extracton is not working well')
+    @pytest.mark.skipif(not on_windows, reason='Windows file-by-file extracton is not working well')
     def test_list_entries_with_weird_names_7z_win(self):
         test_loc = self.get_test_loc('sevenzip/weird_names.7z')
         expected_loc = test_loc + '-entries-expected-win.json'
@@ -288,6 +289,7 @@ def test_extract_file_by_file_with_weird_names_7z(self):
     def test_extract_file_by_file_weird_names_zip(self):
         self.check_extract_file_by_file('sevenzip/weird_names.zip', regen=False)
 
+    @pytest.mark.xfail(on_windows, reason='Fails on Windows becasue it has file names that cannot be extracted there')
     def test_extract_file_by_file_weird_names_ar(self):
         self.check_extract_file_by_file('sevenzip/weird_names.ar', regen=False)