fix: Case when process name is a substring of another process handled (…

…#12)
homecentr · May 25, 2020 · 7ca851c · 7ca851c
1 parent ac5a838
commit 7ca851c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/io/homecentr/testcontainers/containers/GenericContainerEx.java b/src/main/java/io/homecentr/testcontainers/containers/GenericContainerEx.java
@@ -39,7 +39,7 @@ public GenericContainerEx<SELF> withRelativeFileSystemBind(String relativePath,
     }
 
     public Integer getProcessUid(String processName) throws IOException, InterruptedException, ProcessNotFoundException {
-        ExecResult result = executeShellCommand("stat -c '%u' /proc/$(ps axf | grep '"+ processName +"' | grep -v grep |  awk -v def=\"not-found\" '{ print $1 } END { if(NR==0) {print def} }')");
+        ExecResult result = executeShellCommand("stat -c '%u' /proc/$(ps axf | grep '"+ processName +"$' | grep -v grep |  awk -v def=\"not-found\" '{ print $1 } END { if(NR==0) {print def} }')");
 
         if(result.getExitCode() != 0) {
             throw new ProcessNotFoundException(processName);
@@ -51,7 +51,7 @@ public Integer getProcessUid(String processName) throws IOException, Interrupted
     }
 
     public Integer getProcessGid(String processName) throws IOException, InterruptedException, ProcessNotFoundException {
-        ExecResult result = executeShellCommand("stat -c '%g' /proc/$(ps axf | grep '"+ processName +"' | grep -v grep |  awk -v def=\"not-found\" '{ print $1 } END { if(NR==0) {print def} }')");
+        ExecResult result = executeShellCommand("stat -c '%g' /proc/$(ps axf | grep '"+ processName +"$' | grep -v grep |  awk -v def=\"not-found\" '{ print $1 } END { if(NR==0) {print def} }')");
 
         if(result.getExitCode() != 0) {
             throw new ProcessNotFoundException(processName);

diff --git a/...t/java/io/homecentr/testcontainers/containers/GenericContainerEx_getProcessGidShould.java b/...t/java/io/homecentr/testcontainers/containers/GenericContainerEx_getProcessGidShould.java
@@ -50,4 +50,16 @@ public void throwGivenNotExistingProcess() throws IOException, InterruptedExcept
 
         _container.getProcessGid("not-existing");
     }
+
+    @Test
+    public void returnResultWhenProcessNameSubstringOfAnotherProcess() throws IOException, InterruptedException, ProcessNotFoundException {
+        _container = new GenericContainerEx<>("alpine").withCommand("ash", "-c", "sleep 1000");
+        _container.start();
+
+        _container.execInContainer("ash", "-c", "sleep 100 &");
+
+        int gid = _container.getProcessGid("sleep 100");
+
+        assertEquals(0, gid);
+    }
 }
diff --git a/...t/java/io/homecentr/testcontainers/containers/GenericContainerEx_getProcessUidShould.java b/...t/java/io/homecentr/testcontainers/containers/GenericContainerEx_getProcessUidShould.java
@@ -42,4 +42,16 @@ public void throwGivenNotExistingProcess() throws IOException, InterruptedExcept
 
         _container.getProcessUid("not-existing");
     }
+
+    @Test
+    public void returnResultWhenProcessNameSubstringOfAnotherProcess() throws IOException, InterruptedException, ProcessNotFoundException {
+        _container = new GenericContainerEx<>("alpine").withCommand("ash", "-c", "sleep 1000");
+        _container.start();
+
+        _container.execInContainer("ash", "-c", "sleep 100 &");
+
+        int uid = _container.getProcessUid("sleep 100");
+
+        assertEquals(0, uid);
+    }
 }