From 954589b64ba55e0d85be39dc8d7b1260f0ea6f1a Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 21 Mar 2024 15:57:42 +1100 Subject: [PATCH] test: Verify that podman tests are using the pasta binary we expect Paul Holzinger pointed out that when we invoke the podman tests inside the passt testsuite, the way we point podman at the newly built pasta binary is kind of indirect. It's therefore prudent to check that podman is actually using the binary we expect it to - in particular that it is using the binary built in this tree, not some system installed pasta binary. Suggested-by: Paul Holzinger Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- test/pasta_podman/bats | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/pasta_podman/bats b/test/pasta_podman/bats index 46a958a..6b1c575 100644 --- a/test/pasta_podman/bats +++ b/test/pasta_podman/bats @@ -13,7 +13,14 @@ htools git make go bats ip jq socat ./test/podman/bin/podman +set PODMAN test/podman/bin/podman +hout WD pwd + +test Podman pasta path + +hout PASTA_BIN CONTAINERS_HELPER_BINARY_DIR="__WD__" __PODMAN__ info --format "{{.Host.Pasta.Executable}}" +check [ "__PASTA_BIN__" = "__WD__/pasta" ] + test Podman system test with bats -hout WD pwd -host PODMAN="test/podman/bin/podman" CONTAINERS_HELPER_BINARY_DIR="__WD__" bats test/podman/test/system/505-networking-pasta.bats +host PODMAN="__PODMAN__" CONTAINERS_HELPER_BINARY_DIR="__WD__" bats test/podman/test/system/505-networking-pasta.bats