Merge pull request #895 from Morilli/fix-test-concurrency

use File.OpenRead instead of File.Open in tests to allow concurrent access
adamhathcock · Feb 11, 2025 · 96b34ae · 96b34ae
2 parents 55797e5 + d560b46
commit 96b34ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs
@@ -568,7 +568,7 @@ public void Zip_Deflate_PKWear_Multipy_Entry_Access()
     {
         var zipFile = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.pkware.zip");
 
-        using var fileStream = File.Open(zipFile, FileMode.Open);
+        using var fileStream = File.OpenRead(zipFile);
         using var archive = ArchiveFactory.Open(
             fileStream,
             new ReaderOptions { Password = "12345678" }
@@ -729,7 +729,7 @@ public void Zip_Zip64_CompressedSizeExtraOnly_Read()
     public void Zip_Uncompressed_Read_All()
     {
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip");
-        using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read);
+        using var stream = File.OpenRead(zipPath);
         var archive = ArchiveFactory.Open(stream);
         var reader = archive.ExtractAllEntries();
         var entries = 0;
@@ -758,7 +758,7 @@ public void Zip_Uncompressed_Skip_All()
             "DEADBEEF",
         };
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip");
-        using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read);
+        using var stream = File.OpenRead(zipPath);
         var archive = ArchiveFactory.Open(stream);
         var reader = archive.ExtractAllEntries();
         var x = 0;
@@ -775,7 +775,7 @@ public void Zip_Uncompressed_Skip_All()
     public void Zip_Forced_Ignores_UnicodePathExtra()
     {
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.UnicodePathExtra.zip");
-        using (var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read))
+        using (var stream = File.OpenRead(zipPath))
         {
             var archive = ArchiveFactory.Open(
                 stream,
@@ -791,7 +791,7 @@ public void Zip_Forced_Ignores_UnicodePathExtra()
             reader.MoveToNextEntry();
             Assert.Equal("궖귛궖귙귪궖귗귪궖귙_wav.frq", reader.Entry.Key);
         }
-        using (var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read))
+        using (var stream = File.OpenRead(zipPath))
         {
             var archive = ArchiveFactory.Open(
                 stream,

diff --git a/tests/SharpCompress.Test/Zip/ZipReaderTests.cs b/tests/SharpCompress.Test/Zip/ZipReaderTests.cs
@@ -342,7 +342,7 @@ public void Issue_685()
     public void Zip_ReaderFactory_Uncompressed_Read_All()
     {
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip");
-        using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read);
+        using var stream = File.OpenRead(zipPath);
         using var reader = ReaderFactory.Open(stream);
         while (reader.MoveToNextEntry())
         {
@@ -355,7 +355,7 @@ public void Zip_ReaderFactory_Uncompressed_Read_All()
     public void Zip_ReaderFactory_Uncompressed_Skip_All()
     {
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip");
-        using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read);
+        using var stream = File.OpenRead(zipPath);
         using var reader = ReaderFactory.Open(stream);
         while (reader.MoveToNextEntry()) { }
     }
@@ -364,7 +364,7 @@ public void Zip_ReaderFactory_Uncompressed_Skip_All()
     public void Zip_Uncompressed_64bit()
     {
         var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "64bitstream.zip.7z");
-        using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read);
+        using var stream = File.OpenRead(zipPath);
         var archive = ArchiveFactory.Open(stream);
         var reader = archive.ExtractAllEntries();
         reader.MoveToNextEntry();