address review changes of cjdc

canonical · Jun 6, 2024 · 16e6e71 · 16e6e71
1 parent 8c7b5bb
commit 16e6e71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tests/spread/foreign/big/task.yaml b/tests/spread/foreign/big/task.yaml
@@ -27,9 +27,7 @@ execute: |
   docker images
 
   # Check the rock's output
-  id=$(docker run -d big:latest --verbose)
-  grep_docker_log "$id" "/tmp"
-  docker rm -f "$id"
+  docker run --rm big:latest --verbose | MATCH "/tmp"
   
   ############################################################################################
   # test ownership: "newfiles" and "a.txt" are owned by uid 9999, "b.txt" is owned by uid 3333

diff --git a/tests/spread/rockcraft/entrypoint-service/task.yaml b/tests/spread/rockcraft/entrypoint-service/task.yaml
@@ -14,7 +14,8 @@ execute: |
   test "$(docker inspect "$id" -f '{{json .Config.Cmd}}')" = '["foo"]'
   docker logs "$id" 2>&1 | grep "foo"
   docker rm -f "$id"
-  id=$(docker run -d entrypoint-service-test bar)
+  id=$(docker run -d entrypoint-service-test bar \; --verbose)
+  test "$(docker inspect "$id" -f '{{json .Config.Entrypoint}}')" = '["/bin/pebble","enter","--args","test-service","--verbose"]'
   test "$(docker inspect "$id" -f '{{json .Config.Cmd}}')" = '["bar"]'
   docker logs "$id" 2>&1 | grep "bar"
   docker rm -f "$id"