chore(release): 1.2.1

.github/workflows/benchmark.yaml

@@ -17,7 +17,7 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7.0.x'
       - name: Build Deps

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0 # Required by LockCheck CI
 
       - name: Install Dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
 

.github/workflows/release.yaml

@@ -34,7 +34,7 @@ jobs:
           echo Current Version: ${{ steps.get_version.outputs.version }}
 
       - name: Install Dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
 

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Release 1.2.0
+* Prevent hanging on process kill by @domsleee in https://github.com/domsleee/ForceOps/pull/23
+* Disable parallelization on tests
+
 ## Release 1.2.0
 * Add aot, and exe in release
 * Add "list" subcommand

Directory.Build.props

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Description>By hook or by crook, perform operations on files and directories. If they are
             in use by a process, kill the process.</Description>
-        <Version>1.2.0</Version>
+        <Version>1.2.1</Version>
         <PackageProjectUrl>https://github.com/domsleee/forceops</PackageProjectUrl>
         <RepositoryUrl>https://github.com/domsleee/forceops</RepositoryUrl>
         <RepositoryType>git</RepositoryType>

ForceOps.Test/AssemblyInfo.cs

@@ -0,0 +1 @@
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

ForceOps.Test/src/ListFileOrDirectoryLocksTest.cs

@@ -14,11 +14,11 @@ public class ListFileOrDirectoryLocksTest : IDisposable
 	public void WorksForDirectory()
 	{
 		var testContext = new TestContext();
-		using var launchedProcess = LaunchProcessInDirectory(tempDirectoryPath);
+		using var launchedProcess = LaunchPowershellWithCommand(workingDirectory: tempDirectoryPath);
 		new ListFileOrDirectoryLocks(testContext.forceOpsContext).PrintLocks(tempDirectoryPath);
 
-		var stdoutString = stdoutStringBuilder.ToString();
-		Assert.Equal($"ProcessId,ExecutableName,ApplicationName\r\n{launchedProcess.process.Id},powershell.exe,powershell.exe\r\n", stdoutString);
+		var stdoutString = GetStdoutString(stdoutStringBuilder);
+		Assert.Contains($"ProcessId,ExecutableName,ApplicationName\r\n{launchedProcess.process.Id},powershell.exe,powershell.exe\r\n", stdoutString);
 	}
 
 	[Fact]
@@ -29,7 +29,7 @@ public void WorksForFile()
 		using var launchedProcess = HoldLockOnFileUsingPowershell(tempFilePath);
 		new ListFileOrDirectoryLocks(testContext.forceOpsContext).PrintLocks(tempFilePath);
 
-		var stdoutString = stdoutStringBuilder.ToString();
+		var stdoutString = GetStdoutString(stdoutStringBuilder);
 		Assert.Equal($"ProcessId,ExecutableName,ApplicationName\r\n{launchedProcess.process.Id},powershell.exe,powershell.exe\r\n", stdoutString);
 	}
 

ForceOps.Test/src/ProgramTest.cs

@@ -65,7 +65,8 @@ public void RelaunchedProgramWorks()
 		string exeNameOverride = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "forceops.exe");
 		testContext.forceOpsContext.relaunchAsElevated = new RelaunchAsElevated() { verb = "", exeNameOverride = exeNameOverride };
 		var forceOps = new ForceOps(new[] { "delete", tempDirectoryPath }, testContext.forceOpsContext);
-		Assert.True(0 == forceOps.Run(), forceOps.caughtException?.ToString() + testContext.fakeLoggerFactory.GetAllLogsString() + stdoutStringBuilder.ToString());
+		var stdoutString = GetStdoutString(stdoutStringBuilder);
+		Assert.True(0 == forceOps.Run(), forceOps.caughtException?.ToString() + testContext.fakeLoggerFactory.GetAllLogsString() + stdoutString);
 		Assert.True(!Directory.Exists(tempDirectoryPath), "Deleted by relaunch");
 		Assert.Contains("Unable to perform operation as an unelevated process. Retrying as elevated and logging to", testContext.fakeLoggerFactory.GetAllLogsString());
 	}
@@ -108,7 +109,6 @@ public void ListNonExistingFileThrowsMessage()
 		Assert.Equal(@"Cannot list locks of 'C:\C:\C:\'. No such file or directory", testContext.friendlyExitMessage);
 	}
 
-
 	public ProgramTest()
 	{
 		tempDirectoryPath = GetTemporaryFileName();

ForceOps.Test/src/TestUtil.cs

@@ -31,15 +31,42 @@ public static WrappedProcess LaunchPowershellWithCommand(string command = "", st
 			}
 		};
 
-		List<string> output = new();
-		List<string> error = new();
+		StartProcessUntilProcessHasBeenLoadedMessage(process);
+
+		return new WrappedProcess(process);
+	}
+
+	public static WrappedProcess LaunchCmdWithCommand(string command = "", string workingDirectory = "")
+	{
+		var process = new Process
+		{
+			StartInfo = new ProcessStartInfo
+			{
+				FileName = "cmd",
+				WorkingDirectory = workingDirectory,
+				Arguments = $"/c \"{command}; echo process has been loaded && timeout /t 10 /nobreak\"",
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+				CreateNoWindow = true
+			}
+		};
+
+		StartProcessUntilProcessHasBeenLoadedMessage(process);
+
+		return new WrappedProcess(process);
+	}
+
+	static void StartProcessUntilProcessHasBeenLoadedMessage(Process process)
+	{
+		string output = "";
+		string error = "";
 		process.OutputDataReceived += (sender, e) =>
 		{
-			if (e.Data != null) output.Add(e.Data);
+			if (e.Data != null) output += $"{e.Data}{System.Environment.NewLine}";
 		};
 		process.ErrorDataReceived += (sender, e) =>
 		{
-			if (e.Data != null) error.Add(e.Data);
+			if (e.Data != null) error += $"{e.Data}{System.Environment.NewLine}";
 		};
 
 		process.Start();
@@ -48,28 +75,32 @@ public static WrappedProcess LaunchPowershellWithCommand(string command = "", st
 
 		var startTime = DateTime.Now;
 
-		while (!(output.LastOrDefault() ?? "").EndsWith("process has been loaded") && !process.HasExited)
+		while (!output.Contains("process has been loaded") && !process.HasExited)
 		{
 			Thread.Sleep(50);
 			if (DateTime.Now.Subtract(startTime).TotalSeconds > 5)
 			{
-				throw new Exception("Gave up after waiting 5 seconds");
+				throw new Exception($"Gave up after waiting 5 seconds.\nOutput: {output}\nError: {error}");
 			}
 		}
 
 		if (process.HasExited)
 		{
-			throw new Exception($"Process has exited unexpectedly.\nOutput: {string.Join("\n", output)}\nError: {string.Join("\n", error)}");
+			throw new Exception($"Process has exited unexpectedly.\nOutput: {output}\nError: {error}");
 		}
-
-		return new WrappedProcess(process);
 	}
 
 	public static string GetTemporaryFileName()
 	{
 		return Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString());
 	}
 
+	public static string GetStdoutString(StringBuilder stdoutStringBuilder)
+	{
+		Console.Out.Flush();
+		return stdoutStringBuilder.ToString();
+	}
+
 	public static IDisposable CreateTemporaryDirectory(string directory)
 	{
 		Directory.CreateDirectory(directory);
@@ -86,11 +117,13 @@ public static IDisposable CreateTemporaryDirectory(string directory)
 	public static IDisposable RedirectStdout(StringBuilder stringBuilder)
 	{
 		var originalConsoleOut = Console.Out;
+		Console.Out.Flush();
 		Console.SetOut(new StringWriter(stringBuilder));
 
 		return Disposable.Create(() =>
 		{
 			Console.SetOut(originalConsoleOut);
+			Console.Out.Flush();
 		});
 	}
 }