Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Lib/test/test_shutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -1578,9 +1578,6 @@ class TestArchives(BaseTest, unittest.TestCase):

### shutil.make_archive

# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: deferred to Wave 6
@support.requires_zlib()
def test_make_tarball(self):
# creating something to tar
Expand Down Expand Up @@ -2002,19 +1999,13 @@ def check_unpack_tarball(self, format):
('Python 3.14', DeprecationWarning)):
self.check_unpack_archive(format)

# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: deferred to Wave 6
def test_unpack_archive_tar(self):
self.check_unpack_tarball('tar')

@support.requires_zlib()
def test_unpack_archive_gztar(self):
self.check_unpack_tarball('gztar')

# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: deferred to Wave 6
@support.requires_bz2()
def test_unpack_archive_bztar(self):
self.check_unpack_tarball('bztar')
Expand Down
21 changes: 6 additions & 15 deletions Lib/test/test_tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,9 +724,9 @@ def test_extract_directory(self):
finally:
os_helper.rmtree(DIR)

# NSKIP044 https://github.com/nanvix/cpython/issues/524
# NSKIP034 https://github.com/nanvix/cpython/issues/514
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: extractall via pathlike name
"NSKIP034: os.utime(times) does not modify mtime/atime on FAT VFS") # detail: extractall via pathlike name
Comment on lines +727 to +729
def test_extractall_pathlike_name(self):
DIR = pathlib.Path(TEMPDIR) / "extractall"
with os_helper.temp_dir(DIR), \
Expand All @@ -737,9 +737,9 @@ def test_extractall_pathlike_name(self):
path = DIR / tarinfo.name
self.assertEqual(os.path.getmtime(path), tarinfo.mtime)

# NSKIP044 https://github.com/nanvix/cpython/issues/524
# NSKIP034 https://github.com/nanvix/cpython/issues/514
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: extract via pathlike name
"NSKIP034: os.utime(times) does not modify mtime/atime on FAT VFS") # detail: extract via pathlike name
def test_extract_pathlike_name(self):
dirtype = "ustar/dirtype"
DIR = pathlib.Path(TEMPDIR) / "extractall"
Expand Down Expand Up @@ -1239,9 +1239,6 @@ def test_fileobj_no_close(self):
self.assertFalse(fobj.closed)
self.assertEqual(data, fobj.getvalue())

# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: read truncated unexpectedly
def test_eof_marker(self):
# Make sure an end of archive marker is written (two zero blocks).
# tarfile insists on aligning archives to a 20 * 512 byte recordsize.
Expand Down Expand Up @@ -1360,9 +1357,9 @@ def test_gettarinfo_pathlike_name(self):

@unittest.skipUnless(hasattr(os, "link"),
"Missing hardlink implementation")
# NSKIP044 https://github.com/nanvix/cpython/issues/524
# NSKIP024 https://github.com/nanvix/cpython/issues/504
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: link member size handling
"NSKIP024: os.link()/symlink()/readlink() not supported on FAT VFS") # detail: link member size handling
def test_link_size(self):
link = os.path.join(TEMPDIR, "link")
target = os.path.join(TEMPDIR, "link_target")
Expand Down Expand Up @@ -1588,9 +1585,6 @@ class StreamWriteTest(WriteTestBase, unittest.TestCase):
prefix = "w|"
decompressor = None

# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: stream padding read truncated
def test_stream_padding(self):
# Test for bug #1543303.
tar = tarfile.open(tmpname, self.mode)
Expand Down Expand Up @@ -4167,9 +4161,6 @@ def valueerror_filter(tarinfo, path):
self.expect_exception(TypeError) # errorlevel is not int


# NSKIP044 https://github.com/nanvix/cpython/issues/524
@unittest.skipIf(support.is_nanvix,
"NSKIP044: tarfile/archive workflow corruption on Nanvix VFS") # detail: overwrite tests fail on FAT VFS quirks
class OverwriteTests(archiver_tests.OverwriteTests, unittest.TestCase):
testdir = os.path.join(TEMPDIR, "testoverwrite")

Expand Down