From 1d1ff2a2da3b5bea2cb2b779d916db0de5be8536 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 23 Jun 2023 11:10:12 +0200 Subject: [PATCH] naughty: Unify the two patterns for #4829 They only differ in the test name suffix, use a glob to catch them both. Also add the test file. Not important, but keeps the pattern consistent with others. --- naughty/rhel4edge/4829-podman-hang | 2 +- naughty/rhel4edge/4829-podman-hang-2 | 3 --- naughty/ubuntu-2204/4829-podman-hang | 2 +- naughty/ubuntu-2204/4829-podman-hang-2 | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 naughty/rhel4edge/4829-podman-hang-2 delete mode 100644 naughty/ubuntu-2204/4829-podman-hang-2 diff --git a/naughty/rhel4edge/4829-podman-hang b/naughty/rhel4edge/4829-podman-hang index f755fd0e12..4dfadfbbdd 100644 --- a/naughty/rhel4edge/4829-podman-hang +++ b/naughty/rhel4edge/4829-podman-hang @@ -1,3 +1,3 @@ - File "*", line *, in testPruneUnusedContainersSystem + File "test/check-application", line *, in testPruneUnusedContainers* * RuntimeError: Timed out on 'podman run --name inpod --pod pod -tid localhost/test-busybox sh -c 'exit 1'' diff --git a/naughty/rhel4edge/4829-podman-hang-2 b/naughty/rhel4edge/4829-podman-hang-2 deleted file mode 100644 index dc2865ac6d..0000000000 --- a/naughty/rhel4edge/4829-podman-hang-2 +++ /dev/null @@ -1,3 +0,0 @@ - File "*", line *, in testPruneUnusedContainersUser -* -RuntimeError: Timed out on 'podman run --name inpod --pod pod -tid localhost/test-busybox sh -c 'exit 1'' diff --git a/naughty/ubuntu-2204/4829-podman-hang b/naughty/ubuntu-2204/4829-podman-hang index f755fd0e12..4dfadfbbdd 100644 --- a/naughty/ubuntu-2204/4829-podman-hang +++ b/naughty/ubuntu-2204/4829-podman-hang @@ -1,3 +1,3 @@ - File "*", line *, in testPruneUnusedContainersSystem + File "test/check-application", line *, in testPruneUnusedContainers* * RuntimeError: Timed out on 'podman run --name inpod --pod pod -tid localhost/test-busybox sh -c 'exit 1'' diff --git a/naughty/ubuntu-2204/4829-podman-hang-2 b/naughty/ubuntu-2204/4829-podman-hang-2 deleted file mode 100644 index dc2865ac6d..0000000000 --- a/naughty/ubuntu-2204/4829-podman-hang-2 +++ /dev/null @@ -1,3 +0,0 @@ - File "*", line *, in testPruneUnusedContainersUser -* -RuntimeError: Timed out on 'podman run --name inpod --pod pod -tid localhost/test-busybox sh -c 'exit 1''