honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup after DockerTests suite completes (#54164)

Browse Source 
Closes #54101. The Docker tests weren't cleanup up the created container
after the last test completed. Now they are.
This commit is contained in:
Rory Hunter 2020-03-25 11:57:00 +00:00 committed by Rory Hunter
parent 3a3930c7ec
commit b066cc587d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.packaging.util.Platforms;
import org.elasticsearch.packaging.util.ServerUtils;
import org.elasticsearch.packaging.util.Shell.Result;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@ -46,6 +47,7 @@ import static org.elasticsearch.packaging.util.Docker.getContainerLogs;
import static org.elasticsearch.packaging.util.Docker.getImageLabels;
import static org.elasticsearch.packaging.util.Docker.getJson;
import static org.elasticsearch.packaging.util.Docker.mkDirWithPrivilegeEscalation;
import static org.elasticsearch.packaging.util.Docker.removeContainer;
import static org.elasticsearch.packaging.util.Docker.rmDirWithPrivilegeEscalation;
import static org.elasticsearch.packaging.util.Docker.runContainer;
import static org.elasticsearch.packaging.util.Docker.runContainerExpectingFailure;
@ -83,6 +85,11 @@ public class DockerTests extends PackagingTestCase {
assumeTrue("only Docker", distribution().isDocker());
}
@AfterClass
public static void teardownSuite() {
removeContainer();
}
@Before
public void setupTest() throws IOException {
installation = runContainer(distribution());