From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 816FE5A026D for ; Thu, 21 Mar 2024 05:57:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1710997065; bh=6LkRZ4ACwMSdEUlzqecb1J9En6oRbovtw4UsES2TUlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PBqE/NKAMuSfAO4Kyx/bzQ2dppreQUcbViVSu9K2uBrl6bUpfWvritbgQQk3aOD+6 jgu/UwwsyKYViFBOTks/3pIGcgCQM7ijl6ptsq4Hj+hNIuEnMGHic7q3dwBO0/CA/t yP7L5Xobh5d3uCewyTHq0wiZOgZnOLvE9XBMGdmcMGL3Gwvn2Ie69+QnhZ83X085F3 NpKGC+yNQeVeKyPOZcmq4lzLWwQYaeXPxrGNhIXLFPUGbJSIfqzxlTdMj7fr4Fo/cb oEO0QcsNHJaal8S6y5upyLwG+HFTD5jac9fBNEZ4DN4U4c1lhmo7Zg0oeXZENtpRq1 XsXB0IBW5JUeg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4V0Y9j0fW4z4wxZ; Thu, 21 Mar 2024 15:57:45 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 5/5] test: Verify that podman tests are using the pasta binary we expect Date: Thu, 21 Mar 2024 15:57:42 +1100 Message-ID: <20240321045742.2267188-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240321045742.2267188-1-david@gibson.dropbear.id.au> References: <20240321045742.2267188-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: LTOZRFFZGLSRI53NGQ4WHWQEE4X3EMTX X-Message-ID-Hash: LTOZRFFZGLSRI53NGQ4WHWQEE4X3EMTX X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Paul Holzinger , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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 46a958a9..6b1c5751 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 -- 2.44.0