Attempt to fix chkdsk validations

Author: LTRData

Tests/LibraryTests/ExFat/Environment/StreamTestEnvironment.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.IO.Compression;
 using DiscUtils;
+using DiscUtils.Partitions;
 using DiscUtils.Streams;
 using DiscUtils.Vhdx;
 
@@ -41,6 +42,7 @@ private void ExtractVhdx(bool allowDebugKeep)
 
         disk = new Disk(vhdxStream, Ownership.Dispose);
         var volume = VolumeManager.GetPhysicalVolumes(disk)[1];
+        volumeId = ((GuidPartitionInfo)volume.Partition!).Identity;
         PartitionStream = volume.Open();
     }
 }

Tests/LibraryTests/ExFat/Environment/TestEnvironment.cs

@@ -9,12 +9,14 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Security.Principal;
+using System.Threading;
 using DiscUtils.Vhdx;
 
 namespace LibraryTests.ExFat.Environment;
 internal class TestEnvironment : IDisposable
 {
     protected string vhdxPath = null!;
+    protected Guid volumeId;
     protected Disk? disk;
 
     protected TestEnvironment()
@@ -69,26 +71,27 @@ public virtual void Dispose()
         }
     }
 
+#if NET9_0_OR_GREATER
+    private static readonly Lock _lock = new();
+#else
+    private static readonly object _lock = new();
+#endif
+
 #if NETCOREAPP
     [SupportedOSPlatform("windows")]
 #endif
-    private Tuple<bool, string?> CheckDisk()
+    private (bool success, string? checkResult) CheckDisk()
     {
-        var previousDrives = DriveInfo.GetDrives();
-        RunDiskPart("attach", vhdxPath);
-        var newDrives = DriveInfo.GetDrives();
-        var mountedDrive = newDrives.FirstOrDefault(d => previousDrives.All(p => p.Name != d.Name));
-        var success = true;
-        string? checkResult = null;
-        if (mountedDrive != null)
+        lock (_lock)
         {
-            var result = ProcessUtility.Run("chkdsk", mountedDrive.Name.TrimEnd('\\'));
-            success = result.Item1 == 0;
-            checkResult = result.Item2;
-        }
+            RunDiskPart("attach", vhdxPath);
+            var result = ProcessUtility.Run("chkdsk", @$"\\?\Volume{{{volumeId}}} /x");
+            var success = result.Item1 == 0;
+            var checkResult = result.Item3;
 
-        RunDiskPart("detach", vhdxPath);
-        return Tuple.Create(success, checkResult);
+            RunDiskPart("detach", vhdxPath);
+            return (success, checkResult);
+        }
     }
 
 #if NETCOREAPP

Tests/LibraryTests/ExFat/ProcessUtility.cs

@@ -21,7 +21,7 @@ public static class ProcessUtility
     /// <param name="waitForExit">if set to <c>true</c> [wait for exit].</param>
     /// <returns>Either an exit code or a PID (when waitForExit is false)</returns>
     /// <exception cref="ProcessStartInfo.FileName">The file specified in the command parameter <see cref="T:System.IO.FileNotFoundException" /> property could not be found.</exception>
-    public static Tuple<int, string?> Run(string command, string arguments, string? input = null,
+    public static (int pid, int exitCode, string? result) Run(string command, string arguments, string? input = null,
         bool waitForExit = true)
     {
         var process = new Process
@@ -50,7 +50,7 @@ public static class ProcessUtility
         }
         catch
         {
-            return Tuple.Create(-1, (string?)null);
+            return (-1, -1, null);
         }
 
         if (input != null)
@@ -61,11 +61,11 @@ public static class ProcessUtility
 
         if (!waitForExit)
         {
-            return Tuple.Create(process.Id, (string?)null);
+            return (process.Id, -1, null);
         }
 
         process.BeginOutputReadLine();
         process.WaitForExit();
-        return Tuple.Create(process.ExitCode, (string?)resultBuilder.ToString());
+        return (-1, process.ExitCode, (string?)resultBuilder.ToString());
     }
 }