diff options
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java index 5c334837040..c0bf6ebbeb3 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java @@ -7,15 +7,15 @@ import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl; import com.yahoo.vespa.hosted.node.admin.task.util.fs.ContainerPath; import com.yahoo.vespa.hosted.node.admin.task.util.process.CommandResult; import com.yahoo.vespa.test.file.TestFileSystem; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; import static com.yahoo.vespa.hosted.node.admin.maintenance.coredump.CoreCollector.GDB_PATH_RHEL8; import static com.yahoo.vespa.hosted.node.admin.maintenance.coredump.CoreCollector.JAVA_HEAP_DUMP_METADATA; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -37,7 +37,7 @@ public class CoreCollectorTest { "#0 0x00000000004004d8 in main (argv=...) at main.c:4"); @Test - public void extractsBinaryPathTest() { + void extractsBinaryPathTest() { final String[] cmd = {"file", TEST_CORE_PATH.pathInContainer()}; mockExec(cmd, @@ -73,7 +73,7 @@ public class CoreCollectorTest { } @Test - public void extractsBinaryPathUsingGdbTest() { + void extractsBinaryPathUsingGdbTest() { final String[] cmd = new String[]{"/bin/sh", "-c", GDB_PATH_RHEL8 + " -n -batch -core /tmp/core.1234 | grep '^Core was generated by'"}; @@ -91,14 +91,14 @@ public class CoreCollectorTest { } @Test - public void extractsBacktraceUsingGdb() { + void extractsBacktraceUsingGdb() { mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none", - "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, + "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, String.join("\n", GDB_BACKTRACE)); assertEquals(GDB_BACKTRACE, coreCollector.readBacktrace(context, TEST_CORE_PATH, TEST_BIN_PATH, false)); mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none", - "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, + "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, "", "Failure"); try { coreCollector.readBacktrace(context, TEST_CORE_PATH, TEST_BIN_PATH, false); @@ -111,7 +111,7 @@ public class CoreCollectorTest { } @Test - public void extractsBacktraceFromAllThreadsUsingGdb() { + void extractsBacktraceFromAllThreadsUsingGdb() { mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none", "-ex", "thread apply all bt", "-batch", @@ -121,15 +121,15 @@ public class CoreCollectorTest { } @Test - public void collectsDataTest() { + void collectsDataTest() { mockExec(new String[]{"file", TEST_CORE_PATH.pathInContainer()}, "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from " + "'/usr/bin/program'"); mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none", - "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, + "-ex", "bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, String.join("\n", GDB_BACKTRACE)); mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none", - "-ex", "thread apply all bt", "-batch", + "-ex", "thread apply all bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, String.join("\n", GDB_BACKTRACE)); @@ -141,7 +141,7 @@ public class CoreCollectorTest { } @Test - public void collectsPartialIfBacktraceFailsTest() { + void collectsPartialIfBacktraceFailsTest() { mockExec(new String[]{"file", TEST_CORE_PATH.pathInContainer()}, "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from " + "'/usr/bin/program'"); @@ -153,7 +153,7 @@ public class CoreCollectorTest { } @Test - public void reportsJstackInsteadOfGdbForJdkCores() { + void reportsJstackInsteadOfGdbForJdkCores() { mockExec(new String[]{"file", TEST_CORE_PATH.pathInContainer()}, "dump.core.5954: ELF 64-bit LSB core file x86-64, version 1 (SYSV), too many program header sections (33172)"); @@ -171,7 +171,7 @@ public class CoreCollectorTest { } @Test - public void metadata_for_java_heap_dump() { + void metadata_for_java_heap_dump() { assertEquals(JAVA_HEAP_DUMP_METADATA, coreCollector.collect(context, context.paths().of("/dump_java_pid123.hprof"))); } |