tweak spread test for entrypoint-service

canonical · Jun 7, 2024 · 2043e90 · 2043e90
1 parent 27e5257
commit 2043e90
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tests/spread/rockcraft/entrypoint-service/task.yaml b/tests/spread/rockcraft/entrypoint-service/task.yaml
@@ -1,6 +1,7 @@
 summary: container entrypoint-service test
 
 execute: |
+  set -ex
   run_rockcraft pack
 
   test -f entrypoint-service-test_latest_amd64.rock
@@ -14,9 +15,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=$(sh -c 'docker run -d entrypoint-service-test bar \; --verbose')
   test "$(docker inspect "$id" -f '{{json .Config.Entrypoint}}')" = '["/bin/pebble","enter","--args","test-service"]'
-  test "$(docker inspect "$id" -f '{{json .Config.Cmd}}')" = '["bar"]'
-  docker logs "$id" 2>&1 | grep "bar"
+  test "$(docker inspect "$id" -f '{{json .Config.Cmd}}')" = '["bar", ";", "--verbose"]'
+  docker logs "$id" 2>&1 | grep '[test-service] bar'
   docker rm -f "$id"
-  docker run --rm entrypoint-service-test bar \; --verbose | MATCH "bar"