deps: update zlib to 1.3.0.1-motley-7e2e4d7 · nodejs/node@bfe7982
@@ -63,8 +63,9 @@ bool CreateFile(const std::string& content,
6363if (!base::CreateTemporaryFile(file_path))
6464return false;
656566-if (base::WriteFile(*file_path, content.data(), content.size()) == -1)
66+if (!base::WriteFile(*file_path, content)) {
6767return false;
68+ }
68696970 *file = base::File(
7071 *file_path, base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
@@ -350,7 +351,7 @@ class ZipTest : public PlatformTest {
350351 base::Time now_time;
351352EXPECT_TRUE(base::Time::FromUTCExploded(now_parts, &now_time));
352353353-EXPECT_EQ(1, base::WriteFile(src_file, "1", 1));
354+EXPECT_TRUE(base::WriteFile(src_file, "1"));
354355EXPECT_TRUE(base::TouchFile(src_file, base::Time::Now(), test_mtime));
355356356357EXPECT_TRUE(zip::Zip(src_dir, zip_file, true));
@@ -748,6 +749,8 @@ TEST_F(ZipTest, UnzipMixedPaths) {
748749"Space→", //
749750#else
750751" ", //
752+"...", // Disappears on Windows
753+"....", // Disappears on Windows
751754"AUX", // Disappears on Windows
752755"COM1", // Disappears on Windows
753756"COM2", // Disappears on Windows
@@ -1113,9 +1116,9 @@ TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
11131116SCOPED_TRACE(base::StringPrintf("Processing %d.txt", i));
11141117 base::FilePath file_path =
11151118 temp_dir.AppendASCII(base::StringPrintf("%d.txt", i));
1116-int64_t file_size = -1;
1117-EXPECT_TRUE(base::GetFileSize(file_path, &file_size));
1118-EXPECT_EQ(static_cast<int64_t>(i), file_size);
1119+std::optional<int64_t> file_size = base::GetFileSize(file_path);
1120+EXPECT_TRUE(file_size.has_value());
1121+EXPECT_EQ(static_cast<int64_t>(i), file_size.value());
11191122 }
11201123}
11211124@@ -1306,10 +1309,10 @@ TEST_F(ZipTest, Compressed) {
1306130913071310// Since the source files compress well, the destination ZIP file should be
13081311// smaller than the source files.
1309-int64_t dest_file_size;
1310-ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
1311-EXPECT_GT(dest_file_size, 300);
1312-EXPECT_LT(dest_file_size, 1000);
1312+std::optional<int64_t> dest_file_size = base::GetFileSize(dest_file);
1313+ASSERT_TRUE(dest_file_size.has_value());
1314+EXPECT_GT(dest_file_size.value(), 300);
1315+EXPECT_LT(dest_file_size.value(), 1000);
13131316}
1314131713151318// Tests that a ZIP put inside a ZIP is simply stored instead of being
@@ -1338,10 +1341,10 @@ TEST_F(ZipTest, NestedZip) {
13381341// Since the dummy source (inner) ZIP file should simply be stored in the
13391342// destination (outer) ZIP file, the destination file should be bigger than
13401343// the source file, but not much bigger.
1341-int64_t dest_file_size;
1342-ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
1343-EXPECT_GT(dest_file_size, src_size + 100);
1344-EXPECT_LT(dest_file_size, src_size + 300);
1344+std::optional<int64_t> dest_file_size = base::GetFileSize(dest_file);
1345+ASSERT_TRUE(dest_file_size.has_value());
1346+EXPECT_GT(dest_file_size.value(), src_size + 100);
1347+EXPECT_LT(dest_file_size.value(), src_size + 300);
13451348}
1346134913471350// Tests that there is no 2GB or 4GB limits. Tests that big files can be zipped
@@ -1402,10 +1405,10 @@ TEST_F(ZipTest, BigFile) {
14021405// Since the dummy source (inner) ZIP file should simply be stored in the
14031406// destination (outer) ZIP file, the destination file should be bigger than
14041407// the source file, but not much bigger.
1405-int64_t dest_file_size;
1406-ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
1407-EXPECT_GT(dest_file_size, src_size + 100);
1408-EXPECT_LT(dest_file_size, src_size + 300);
1408+std::optional<int64_t> dest_file_size = base::GetFileSize(dest_file);
1409+ASSERT_TRUE(dest_file_size.has_value());
1410+EXPECT_GT(dest_file_size.value(), src_size + 100);
1411+EXPECT_LT(dest_file_size.value(), src_size + 300);
1409141214101413LOG(INFO) << "Reading big ZIP " << dest_file;
14111414 zip::ZipReader reader;