containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/compose: remove compose v1 code 

Now that we only test compose v2 remove the special cases from the test
code to simply the tests.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2024-04-18 14:24:38 +02:00
parent 2c61ee9a31
commit b1736c472a
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/compose/README.md
View File

@ -1,7 +1,8 @@
Tests for docker-compose Tests for docker-compose v2
======================== ===========================
This directory contains tests for docker-compose under podman. This directory contains tests for docker-compose v2 under podman.
docker-compose v1 is no longer supported upstream so we no longer test with it.
Each subdirectory must contain one docker-compose.yml file along with Each subdirectory must contain one docker-compose.yml file along with
all necessary infrastructure for it (e.g. Containerfile, any files all necessary infrastructure for it (e.g. Containerfile, any files

3
test/compose/etc_hosts/tests.sh
View File

@ -1,9 +1,6 @@
# -*- bash -*- # -*- bash -*-
ctr_name="etc_hosts_test_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="etc_hosts-test-1" ctr_name="etc_hosts-test-1"
fi
podman exec "$ctr_name" sh -c 'grep "foobar" /etc/hosts' podman exec "$ctr_name" sh -c 'grep "foobar" /etc/hosts'
like "$output" "10\.123\.0\." "$testname : no entries are copied from the host" like "$output" "10\.123\.0\." "$testname : no entries are copied from the host"

3
test/compose/ipam_set_ip/tests.sh
View File

@ -1,9 +1,6 @@
# -*- bash -*- # -*- bash -*-
ctr_name="ipam_set_ip_test_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="ipam_set_ip-test-1" ctr_name="ipam_set_ip-test-1"
fi
podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}' podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}'
is "$output" "10.123.0.253" "$testname : ip address is set" is "$output" "10.123.0.253" "$testname : ip address is set"
podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.MacAddress }}' podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.MacAddress }}'

3
test/compose/two_networks/tests.sh
View File

@ -1,9 +1,6 @@
# -*- bash -*- # -*- bash -*-
ctr_name="two_networks_con1_1"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
ctr_name="two_networks-con1-1" ctr_name="two_networks-con1-1"
fi
podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}' podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}'
is "$output" "2" "$testname : Container is connected to both networks" is "$output" "2" "$testname : Container is connected to both networks"
podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}' podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}'

3
test/compose/uptwice/tests.sh
View File

@ -10,8 +10,5 @@ output=$(podman_compose up -d 2>&1)
# Horrible output check here but we really want to make sure that there are # Horrible output check here but we really want to make sure that there are
# no unexpected warning/errors and the normal messages are send on stderr as # no unexpected warning/errors and the normal messages are send on stderr as
# well so we cannot check for an empty stderr. # well so we cannot check for an empty stderr.
expected="Recreating uptwice_app_1 ... ${CR}${NL}Recreating uptwice_app_1 ... done$CR"
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started" expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started"
fi
is "$output" "$expected" "no error output in compose up (#15580)" is "$output" "$expected" "no error output in compose up (#15580)"