Merge pull request #1953 from newrelic/dockerid-cross-agent-test-updates

Remove docker ID uncross agent tests
newrelic · Jun 21, 2024 · ecb58c1 · ecb58c1
2 parents ec78e39 + 7a77dc3
commit ecb58c1
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 184 deletions.
diff --git a/newrelic-agent/src/test/java/com/newrelic/agent/utilization/DockerDataTest.java b/newrelic-agent/src/test/java/com/newrelic/agent/utilization/DockerDataTest.java
@@ -98,8 +98,8 @@ public void testCheckLineAndGetIdInValidV2() {
 
     @Test
     public void testGetDockerIdFromFilesV2() throws Exception {
-        Map<String, String> tests = testToAnswers(AgentHelper.getFile("com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/cases.json"));
-        List<File> files = AgentHelper.getFiles("com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/");
+        Map<String, String> tests = testToAnswers(AgentHelper.getFile("com/newrelic/agent/cross_agent_tests/docker_container_id_v2/cases.json"));
+        List<File> files = AgentHelper.getFiles("com/newrelic/agent/cross_agent_tests/docker_container_id_v2");
         if (files == null || files.isEmpty()) {
             Assert.fail("There were no files read in for testing.");
         }

diff --git a/.../com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/README.md b/.../com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/README.md
diff --git a/...resources/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/cases.json b/...resources/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/cases.json
diff --git a/...m/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/cgroup_v2_expected.txt b/...m/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/cgroup_v2_expected.txt
diff --git a/.../agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_invalid_characters.txt b/.../agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_invalid_characters.txt
diff --git a/...m/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_too_long.txt b/...m/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_too_long.txt
diff --git a/.../newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_too_short.txt b/.../newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_id_too_short.txt
diff --git a/...agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_linux2.6.26_v1_enabled.txt b/...agent/uncross_agent_tests/cgroup_v2_docker_container_id/docker_linux2.6.26_v1_enabled.txt
diff --git a/.../resources/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/empty.txt b/.../resources/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/empty.txt
diff --git a/...ces/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/linux_prefix.txt b/...ces/com/newrelic/agent/uncross_agent_tests/cgroup_v2_docker_container_id/linux_prefix.txt