diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-18 12:48:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 12:48:41 +0100 |
| commit | 3853ef9b598b82115c1609957169614b26320a26 (patch) | |
| tree | a9ef29d6110b1f5d458a0f33a209c009133ca880 /test/compose | |
| parent | e471bf532c751c4f775d8d9f5f8bba35104acbb5 (diff) | |
| parent | 4b359e4598ec795b8eff3dfebae52b17c195c22b (diff) | |
| download | podman-3853ef9b598b82115c1609957169614b26320a26.tar.gz podman-3853ef9b598b82115c1609957169614b26320a26.tar.bz2 podman-3853ef9b598b82115c1609957169614b26320a26.zip | |
Merge pull request #13540 from mheon/fix_11822
Deduplicate between Volumes and Mounts in compat API
Diffstat (limited to 'test/compose')
| -rw-r--r-- | test/compose/ipam_set_ip/tests.sh | 6 | ||||
| -rw-r--r-- | test/compose/two_networks/tests.sh | 8 |
2 files changed, 11 insertions, 3 deletions
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" diff --git a/test/compose/two_networks/tests.sh b/test/compose/two_networks/tests.sh index 1cc88aa5f..af0d1fbe3 100644 --- a/test/compose/two_networks/tests.sh +++ b/test/compose/two_networks/tests.sh @@ -1,7 +1,11 @@ # -*- bash -*- -podman container inspect two_networks_con1_1 --format '{{len .NetworkSettings.Networks}}' +ctr_name="two_networks_con1_1" +if [ "$TEST_FLAVOR" = "compose_v2" ]; then + ctr_name="two_networks-con1-1" +fi +podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}' is "$output" "2" "$testname : Container is connected to both networks" -podman container inspect two_networks_con1_1 --format '{{.NetworkSettings.Networks}}' +podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}' like "$output" "two_networks_net1" "$testname : First network name exists" like "$output" "two_networks_net2" "$testname : Second network name exists" |