From 4b359e4598ec795b8eff3dfebae52b17c195c22b Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 17 Mar 2022 15:16:13 -0400 Subject: Set names in compose tests based on version Compose v2 uses dashes as separators instead of hyphens. This broke some tests that relied upon container names. Set the name conditionally to make it safe for both. Signed-off-by: Matthew Heon --- test/compose/ipam_set_ip/tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test/compose/ipam_set_ip/tests.sh') diff --git a/test/compose/ipam_set_ip/tests.sh b/test/compose/ipam_set_ip/tests.sh index ecaf3167e..b9e761ea2 100644 --- a/test/compose/ipam_set_ip/tests.sh +++ b/test/compose/ipam_set_ip/tests.sh @@ -1,4 +1,8 @@ # -*- bash -*- -podman container inspect ipam_set_ip_test_1 --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}' +ctr_name="ipam_set_ip_test_1" +if [ "$TEST_FLAVOR" = "compose_v2" ]; then + ctr_name="ipam_set_ip-test-1" +fi +podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}' like "$output" "10.123.0.253" "$testname : ip address is set" -- cgit v1.2.3-54-g00ecf