]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix two tests when ZIP compression unsupported 1221/head
authorJohn Marino <draco@marino.st>
Sat, 6 Jul 2019 16:17:31 +0000 (11:17 -0500)
committerJohn Marino <draco@marino.st>
Sat, 6 Jul 2019 16:17:31 +0000 (11:17 -0500)
libarchive/test/test_read_format_zip.c
libarchive/test/test_read_format_zip_traditional_encryption_data.c

index b6e957a96cec5599f353cf03cc943f399e2da406..9afbfb6c58666103d09da1549edb03aa037fe954 100644 (file)
@@ -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);
        }
 
index 305261567ec8518a073e82af68f811ddf9480f58..20e55bbc694894cd35d8f8e02de503ce4cdc5102 100644 (file)
@@ -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);
        }