diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch b/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch deleted file mode 100644 index 681e03a465..0000000000 --- a/meta/recipes-devtools/python/python3-libarchive-c/new-libarchive.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From adb206946721a4f5bd1190ab9c975bab4373e35c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changaco <changaco@changaco.oy.lc> | ||
| 3 | Date: Fri, 27 Sep 2024 11:51:22 +0200 | ||
| 4 | Subject: [PATCH] update a test failing with new libarchive versions | ||
| 5 | |||
| 6 | fixes #130 | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/Changaco/python-libarchive-c/pull/131] | ||
| 9 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 10 | --- | ||
| 11 | tests/test_entry.py | 10 ++++++++-- | ||
| 12 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/tests/test_entry.py b/tests/test_entry.py | ||
| 15 | index 419cecb..34543a5 100644 | ||
| 16 | --- a/tests/test_entry.py | ||
| 17 | +++ b/tests/test_entry.py | ||
| 18 | @@ -9,7 +9,7 @@ | ||
| 19 | |||
| 20 | import pytest | ||
| 21 | |||
| 22 | -from libarchive import memory_reader, memory_writer | ||
| 23 | +from libarchive import ArchiveError, memory_reader, memory_writer | ||
| 24 | from libarchive.entry import ArchiveEntry, ConsumedArchiveEntry, PassedArchiveEntry | ||
| 25 | |||
| 26 | from . import data_dir, get_entries, get_tarinfos | ||
| 27 | @@ -64,7 +64,13 @@ def test_check_ArchiveEntry_against_TarInfo(): | ||
| 28 | |||
| 29 | |||
| 30 | def test_check_archiveentry_using_python_testtar(): | ||
| 31 | - check_entries(join(data_dir, 'testtar.tar')) | ||
| 32 | + # This test behaves differently depending on the libarchive version: | ||
| 33 | + # 3.5, 3.6 and presumably all future versions reject the archive as damaged, | ||
| 34 | + # whereas older versions accepted it. | ||
| 35 | + try: | ||
| 36 | + check_entries(join(data_dir, 'testtar.tar')) | ||
| 37 | + except ArchiveError as e: | ||
| 38 | + assert e.msg == "Damaged tar archive" | ||
| 39 | |||
| 40 | |||
| 41 | def test_check_archiveentry_with_unicode_and_binary_entries_tar(): | ||
