From 364f4693a95fe75320268c20f1e031130a8177e5 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 6 Jul 2019 11:17:31 -0500 Subject: [PATCH] Fix two tests when ZIP compression unsupported --- libarchive/test/test_read_format_zip.c | 8 ++++---- .../test_read_format_zip_traditional_encryption_data.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index b6e957a96..9afbfb6c5 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -139,7 +139,7 @@ verify_basic(struct archive *a, int seek_checks) } else { assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19)); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } @@ -162,7 +162,7 @@ verify_basic(struct archive *a, int seek_checks) } else { assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19)); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); @@ -231,7 +231,7 @@ verify_info_zip_ux(struct archive *a, int seek_checks) } else { assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19)); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); @@ -302,7 +302,7 @@ verify_extract_length_at_end(struct archive *a, int seek_checks) } else { assertEqualIntA(a, ARCHIVE_FAILED, archive_read_extract(a, ae, 0)); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } diff --git a/libarchive/test/test_read_format_zip_traditional_encryption_data.c b/libarchive/test/test_read_format_zip_traditional_encryption_data.c index 305261567..20e55bbc6 100644 --- a/libarchive/test/test_read_format_zip_traditional_encryption_data.c +++ b/libarchive/test/test_read_format_zip_traditional_encryption_data.c @@ -130,7 +130,7 @@ DEFINE_TEST(test_read_format_zip_traditional_encryption_data) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } @@ -148,7 +148,7 @@ DEFINE_TEST(test_read_format_zip_traditional_encryption_data) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } -- 2.47.2