Make Docker test robust when removing a temp dir (#61639)

Closes #61614. Closes #61553. In a particular Docker test, ensure is shut down before removing the data directory. Also add the force flag to `rm`.
Nicksqain · Sep 1, 2020 · 50119bb · 50119bb
1 parent d94d6b5
commit 50119bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
@@ -223,6 +223,10 @@ public void test071BindMountCustomPathWithDifferentUID() throws Exception {
             assertThat(nodes.at("/_nodes/successful").intValue(), equalTo(1));
             assertThat(nodes.at("/_nodes/failed").intValue(), equalTo(0));
 
+            // Ensure container is stopped before we remove tempEsDataDir, so nothing
+            // is using the directory.
+            removeContainer();
+
             rmDirWithPrivilegeEscalation(tempEsDataDir);
         });
     }

diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java
@@ -419,7 +419,7 @@ public static void rmDirWithPrivilegeEscalation(Path localPath) {
 
         args.add("cd " + containerBasePath.toAbsolutePath());
         args.add("&&");
-        args.add("rm -r " + localPath.getFileName());
+        args.add("rm -rf " + localPath.getFileName());
         final String command = String.join(" ", args);
         executePrivilegeEscalatedShellCmd(command, localPath, containerPath);
     }