5 files changed, 41 insertions, 2 deletions
diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at
index 7b500bf57..f866422e2 100644
--- a/test/apiv2/10-images.at
+++ b/test/apiv2/10-images.at
@@ -41,10 +41,17 @@ t GET images/$iid/json 200 \
   .Id=sha256:$iid \
   .RepoTags[0]=$IMAGE
 
-t POST "images/create?fromImage=alpine" '' 200
+t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*Download complete.*"
 
 t POST "images/create?fromImage=alpine&tag=latest" '' 200
 
+# Make sure that new images are pulled
+old_iid=$(podman image inspect --format "{{.ID}}" docker.io/library/alpine:latest)
+podman rmi -f docker.io/library/alpine:latest
+podman tag $IMAGE docker.io/library/alpine:latest
+t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*$old_iid.*"
+podman untag $IMAGE docker.io/library/alpine:latest
+
 t POST "images/create?fromImage=quay.io/libpod/alpine&tag=sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" '' 200
 
 # Display the image history
diff --git a/test/apiv2/12-imagesMore.at b/test/apiv2/12-imagesMore.at
index fe6a271ce..4f3ddf925 100644
--- a/test/apiv2/12-imagesMore.at
+++ b/test/apiv2/12-imagesMore.at
@@ -3,6 +3,9 @@
 # Tests for more image-related endpoints
 #
 
+red='\e[31m'
+nc='\e[0m'
+
 podman pull -q $IMAGE
 
 t GET libpod/images/json 200 \
@@ -26,6 +29,17 @@ t GET libpod/images/$IMAGE/json 200 \
 podman run -d --name registry -p 5000:5000 quay.io/libpod/registry:2.6 /entrypoint.sh /etc/docker/registry/config.yml
 wait_for_port localhost 5000
 
+# Push to local registry and check output
+while read -r LINE
+do
+  if echo "${LINE}" | jq --exit-status 'select( .status != null) | select ( .status | contains("digest: sha256:"))' &>/dev/null; then
+    GOT_DIGEST="1"
+  fi
+done < <(curl -sL "http://$HOST:$PORT/images/localhost:5000/myrepo/push?tlsVerify=false&tag=mytag" -XPOST)
+if [ -z "${GOT_DIGEST}" ] ; then
+  echo -e "${red}not ok: did not found digest in output${nc}"  1>&2;
+fi
+
 # Push to local registry
 t POST "images/localhost:5000/myrepo/push?tlsVerify=false&tag=mytag" '' 200
 
@@ -43,3 +57,7 @@ t DELETE libpod/images/$IMAGE 200 \
   .ExitCode=0
 t DELETE libpod/images/quay.io/libpod/registry:2.6 200 \
   .ExitCode=0
+
+if [ -z "${GOT_DIGEST}" ] ; then
+  exit 1;
+fi
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 0da196e46..a99e9a184 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -63,7 +63,7 @@ cid=$(jq -r '.Id' <<<"$output")
 # Prior to the fix in #6835, this would fail 500 "args must not be empty"
 t POST   libpod/containers/${cid}/start '' 204
 # Container should exit almost immediately. Wait for it, confirm successful run
-t POST   libpod/containers/${cid}/wait  '' 200 '0'
+t POST   "libpod/containers/${cid}/wait?condition=stopped&condition=exited"  '' 200 '0'
 t GET    libpod/containers/${cid}/json 200 \
   .Id=$cid \
   .State.Status~\\\(exited\\\|stopped\\\) \
diff --git a/test/apiv2/35-networks.at b/test/apiv2/35-networks.at
index 5327bd076..25a292cc5 100644
--- a/test/apiv2/35-networks.at
+++ b/test/apiv2/35-networks.at
@@ -38,6 +38,9 @@ length=2
 # filters={"label":["abc"]}
 t GET networks?filters=%7B%22label%22%3A%5B%22abc%22%5D%7D 200 \
 length=1
+# filters={"label":{"abc":true}} old docker filter type see #9526
+t GET networks?filters=%7B%22label%22%3A%7B%22abc%22%3Atrue%7D%7D 200 \
+length=1
 # id filter filters={"id":["a7662f44d65029fd4635c91feea3d720a57cef52e2a9fcc7772b69072cc1ccd1"]}
 t GET networks?filters=%7B%22id%22%3A%5B%22a7662f44d65029fd4635c91feea3d720a57cef52e2a9fcc7772b69072cc1ccd1%22%5D%7D 200 \
 length=1 \
@@ -46,6 +49,9 @@ length=1 \
 # invalid filter filters={"dangling":["1"]}
 t GET networks?filters=%7B%22dangling%22%3A%5B%221%22%5D%7D 500 \
 .cause='invalid filter "dangling"'
+# (#9293 with no networks the endpoint should return empty array instead of null)
+t GET networks?filters=%7B%22name%22%3A%5B%22doesnotexists%22%5D%7D 200 \
+"[]"
 
 # network inspect docker
 t GET networks/a7662f44d65029fd4635c91feea3d720a57cef52e2a9fcc7772b69072cc1ccd1 200 \
diff --git a/test/apiv2/rest_api/test_rest_v2_0_0.py b/test/apiv2/rest_api/test_rest_v2_0_0.py
index 73db35cc1..05c24f2ea 100644
--- a/test/apiv2/rest_api/test_rest_v2_0_0.py
+++ b/test/apiv2/rest_api/test_rest_v2_0_0.py
@@ -483,8 +483,16 @@ class TestApi(unittest.TestCase):
         inspect = requests.get(PODMAN_URL + f"/v1.40/networks/{ident}")
         self.assertEqual(inspect.status_code, 404, inspect.content)
 
+        # network prune
+        prune_name = "Network_" + "".join(random.choice(string.ascii_letters) for i in range(10))
+        prune_create = requests.post(PODMAN_URL + "/v1.40/networks/create", json={"Name": prune_name})
+        self.assertEqual(create.status_code, 201, prune_create.content)
+
         prune = requests.post(PODMAN_URL + "/v1.40/networks/prune")
         self.assertEqual(prune.status_code, 200, prune.content)
+        obj = json.loads(prune.content)
+        self.assertTrue(prune_name in obj["NetworksDeleted"])
+
 
     def test_volumes_compat(self):
         name = "Volume_" + "".join(random.choice(string.ascii_letters) for i in range(10))