cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 21:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with the GetCommandLine test helper

Browse Source
This commit is contained in:
Jordan Dominion
2023-07-08 09:29:17 -04:00
parent f31be02f1b
commit 7e0af87ee2
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+11 -4
View File
@@ -66,7 +66,7 @@ namespace Tgstation.Server.Tests.Live
if (port.HasValue)
result = result.Where(x =>
{
if (GetCommandLine(x).Contains($"-port {port.Value}"))
if (GetCommandLine(x)?.Contains($"-port {port.Value}") ?? false)
return true;
x.Dispose();
@@ -85,9 +85,16 @@ namespace Tgstation.Server.Tests.Live
return objects.Cast<ManagementBaseObject>().SingleOrDefault()?["CommandLine"]?.ToString();
}
var cmdlineFile = File.ReadAllText($"/proc/{process.Id}/cmdline");
var parsed = cmdlineFile.Replace('\0', ' ');
return parsed;
try
{
var cmdlineFile = File.ReadAllText($"/proc/{process.Id}/cmdline");
var parsed = cmdlineFile.Replace('\0', ' ');
return parsed;
}
catch (FileNotFoundException)
{
return null;
}
}
static void TerminateAllDDs()