From 66924e1d42d370bb49964ac24d4392d7a324a4a5 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 15 Apr 2019 16:32:17 +0200 Subject: [PATCH 1/4] add test --- .../Diagnostics/ProcessManager.Linux.cs | 9 +++- .../tests/ProcessTestBase.cs | 14 +++++- .../tests/ProcessTests.Unix.cs | 47 +++++++++++++++++++ 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs index 69800f10b0fb..02a82055f05a 100644 --- a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs +++ b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs @@ -128,10 +128,17 @@ internal static ProcessInfo CreateProcessInfo(Interop.procfs.ParsedStat procFsSt { int pid = procFsStat.pid; + // Get long process name if possible, otherwise use a fall back method. + string procName = Path.GetFileName(Process.GetExePath(pid)); + if (String.IsNullOrEmpty(procName)) + { + procName = procFsStat.comm; + } + var pi = new ProcessInfo() { ProcessId = pid, - ProcessName = procFsStat.comm, + ProcessName = procName, BasePriority = (int)procFsStat.nice, VirtualBytes = (long)procFsStat.vsize, WorkingSet = procFsStat.rss * Environment.SystemPageSize, diff --git a/src/System.Diagnostics.Process/tests/ProcessTestBase.cs b/src/System.Diagnostics.Process/tests/ProcessTestBase.cs index 8fc68010c392..ec3a2a80324e 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTestBase.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTestBase.cs @@ -100,6 +100,16 @@ protected void StartSleepKillWait(Process p) /// /// protected static bool IsProgramInstalled(string program) + { + return !(GetProgramPath(program) is null); + } + + /// + /// Return program path + /// + /// + /// + protected static string GetProgramPath(string program) { string path; string pathEnvVar = Environment.GetEnvironmentVariable("PATH"); @@ -113,11 +123,11 @@ protected static bool IsProgramInstalled(string program) path = Path.Combine(subPath, program); if (File.Exists(path)) { - return true; + return path; } } } - return false; + return null; } } } diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index 94de927dcb47..0d1936a11cb0 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -58,6 +58,53 @@ public void GetProcessesByName_RemoteMachineNameUnix_ThrowsPlatformNotSupportedE Assert.Throws(() => Process.GetProcessesByName(currentProcess.ProcessName, machineName)); } + [Fact] + public void GetProcesses_LongProcessName() + { + string commandName = "sleep"; + + // sleep program doesn't exist on some distros + if (IsProgramInstalled(commandName)) + { + string tmpDir = Path.Combine(TestDirectory, GetTestFileName()); + try + { + // create tmp folder and copy sleep command inside it renamed + Directory.CreateDirectory(tmpDir); + string longProcessName = "123456789012345678901234567890"; + string sleepCommandPathFileName = Path.Combine(tmpDir, longProcessName); + File.Copy(GetProgramPath(commandName), sleepCommandPathFileName); + Assert.True(File.Exists(sleepCommandPathFileName)); + + // start sleep program and wait for some seconds + using (Process px = Process.Start(new ProcessStartInfo { FileName = sleepCommandPathFileName , Arguments = "5s", UseShellExecute = true})) + { + bool processFound = false; + foreach(Process process in Process.GetProcesses()) + { + if (process.ProcessName == longProcessName) + { + processFound = true; + break; + } + } + px.Kill(); + px.WaitForExit(); + Assert.True(px.HasExited); + + Assert.True(processFound, $"Process named '{longProcessName}' not found"); + } + } + finally + { + if (Directory.Exists(tmpDir)) + { + Directory.Delete(tmpDir, true); + } + } + } + } + [Fact] public void TestRootGetProcessById() { From cb09ce6823d4bc3da6dd3532064c7e4828909b0d Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 15 Apr 2019 17:50:21 +0200 Subject: [PATCH 2/4] address PR feedback --- .../tests/ProcessTestBase.cs | 2 +- .../tests/ProcessTests.Unix.cs | 47 ------------------- .../tests/ProcessTests.cs | 35 ++++++++++++++ 3 files changed, 36 insertions(+), 48 deletions(-) diff --git a/src/System.Diagnostics.Process/tests/ProcessTestBase.cs b/src/System.Diagnostics.Process/tests/ProcessTestBase.cs index ec3a2a80324e..9b15ab99324e 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTestBase.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTestBase.cs @@ -101,7 +101,7 @@ protected void StartSleepKillWait(Process p) /// protected static bool IsProgramInstalled(string program) { - return !(GetProgramPath(program) is null); + return GetProgramPath(program) != null; } /// diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index 0d1936a11cb0..94de927dcb47 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -58,53 +58,6 @@ public void GetProcessesByName_RemoteMachineNameUnix_ThrowsPlatformNotSupportedE Assert.Throws(() => Process.GetProcessesByName(currentProcess.ProcessName, machineName)); } - [Fact] - public void GetProcesses_LongProcessName() - { - string commandName = "sleep"; - - // sleep program doesn't exist on some distros - if (IsProgramInstalled(commandName)) - { - string tmpDir = Path.Combine(TestDirectory, GetTestFileName()); - try - { - // create tmp folder and copy sleep command inside it renamed - Directory.CreateDirectory(tmpDir); - string longProcessName = "123456789012345678901234567890"; - string sleepCommandPathFileName = Path.Combine(tmpDir, longProcessName); - File.Copy(GetProgramPath(commandName), sleepCommandPathFileName); - Assert.True(File.Exists(sleepCommandPathFileName)); - - // start sleep program and wait for some seconds - using (Process px = Process.Start(new ProcessStartInfo { FileName = sleepCommandPathFileName , Arguments = "5s", UseShellExecute = true})) - { - bool processFound = false; - foreach(Process process in Process.GetProcesses()) - { - if (process.ProcessName == longProcessName) - { - processFound = true; - break; - } - } - px.Kill(); - px.WaitForExit(); - Assert.True(px.HasExited); - - Assert.True(processFound, $"Process named '{longProcessName}' not found"); - } - } - finally - { - if (Directory.Exists(tmpDir)) - { - Directory.Delete(tmpDir, true); - } - } - } - } - [Fact] public void TestRootGetProcessById() { diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.cs b/src/System.Diagnostics.Process/tests/ProcessTests.cs index fe0897f4129b..ede51cef079d 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.cs @@ -1875,6 +1875,41 @@ public void TestLongProcessIsWorking() Assert.True(p.HasExited); } + [Fact] + public void GetProcesses_LongProcessName() + { + string commandName = "sleep"; + + // sleep program doesn't exist on some flavor + if (!IsProgramInstalled(commandName)) + { + return; + } + + string longProcessName = "123456789012345678901234567890"; + string sleepCommandPathFileName = Path.Combine(TestDirectory, longProcessName); + File.Copy(GetProgramPath(commandName), sleepCommandPathFileName); + + // start sleep program and wait for some seconds + using (Process px = Process.Start(new ProcessStartInfo { FileName = sleepCommandPathFileName , Arguments = "30s", UseShellExecute = true})) + { + bool processFound = false; + foreach (Process process in Process.GetProcesses()) + { + if (process.ProcessName == longProcessName) + { + processFound = true; + break; + } + } + px.Kill(); + px.WaitForExit(); + Assert.True(px.HasExited); + + Assert.True(processFound, $"Process named '{longProcessName}' not found"); + } + } + private string GetCurrentProcessName() { return $"{Process.GetCurrentProcess().ProcessName}.exe"; From 2ea8222e7edf48dfb0ee93bce227f86168697a24 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 15 Apr 2019 17:53:16 +0200 Subject: [PATCH 3/4] update sleep arg for win --- src/System.Diagnostics.Process/tests/ProcessTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.cs b/src/System.Diagnostics.Process/tests/ProcessTests.cs index ede51cef079d..f108a8f4c86a 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.cs @@ -1891,7 +1891,7 @@ public void GetProcesses_LongProcessName() File.Copy(GetProgramPath(commandName), sleepCommandPathFileName); // start sleep program and wait for some seconds - using (Process px = Process.Start(new ProcessStartInfo { FileName = sleepCommandPathFileName , Arguments = "30s", UseShellExecute = true})) + using (Process px = Process.Start(new ProcessStartInfo { FileName = sleepCommandPathFileName , Arguments = "30", UseShellExecute = true})) { bool processFound = false; foreach (Process process in Process.GetProcesses()) From 5d89e9b2e3d59031ff8e3166711a414d1a9abaaa Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 15 Apr 2019 18:53:23 +0200 Subject: [PATCH 4/4] fix indent --- src/System.Diagnostics.Process/tests/ProcessTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Diagnostics.Process/tests/ProcessTests.cs b/src/System.Diagnostics.Process/tests/ProcessTests.cs index f108a8f4c86a..48367a205bc7 100644 --- a/src/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/System.Diagnostics.Process/tests/ProcessTests.cs @@ -1875,7 +1875,7 @@ public void TestLongProcessIsWorking() Assert.True(p.HasExited); } - [Fact] + [Fact] public void GetProcesses_LongProcessName() { string commandName = "sleep";