From b1736c472a5f0975901b94285f5227e1cc3d2f90 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Thu, 18 Apr 2024 14:24:38 +0200
Subject: [PATCH] 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>
---
 test/compose/README.md             | 7 ++++---
 test/compose/etc_hosts/tests.sh    | 5 +----
 test/compose/ipam_set_ip/tests.sh  | 5 +----
 test/compose/two_networks/tests.sh | 5 +----
 test/compose/uptwice/tests.sh      | 5 +----
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/test/compose/README.md b/test/compose/README.md
index 863decf2c9..12ecbaebfc 100644
--- a/test/compose/README.md
+++ b/test/compose/README.md
@@ -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
 all necessary infrastructure for it (e.g. Containerfile, any files
diff --git a/test/compose/etc_hosts/tests.sh b/test/compose/etc_hosts/tests.sh
index 16ed314bf7..80da78c083 100644
--- a/test/compose/etc_hosts/tests.sh
+++ b/test/compose/etc_hosts/tests.sh
@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="etc_hosts_test_1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="etc_hosts-test-1"
-fi
+ctr_name="etc_hosts-test-1"
 
 podman exec "$ctr_name" sh -c 'grep "foobar" /etc/hosts'
 like "$output" "10\.123\.0\." "$testname : no entries are copied from the host"
diff --git a/test/compose/ipam_set_ip/tests.sh b/test/compose/ipam_set_ip/tests.sh
index 945303e52a..4686fb82ed 100644
--- a/test/compose/ipam_set_ip/tests.sh
+++ b/test/compose/ipam_set_ip/tests.sh
@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="ipam_set_ip_test_1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="ipam_set_ip-test-1"
-fi
+ctr_name="ipam_set_ip-test-1"
 podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}'
 is "$output" "10.123.0.253" "$testname : ip address is set"
 podman container inspect "$ctr_name" --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.MacAddress }}'
diff --git a/test/compose/two_networks/tests.sh b/test/compose/two_networks/tests.sh
index af0d1fbe37..e22b76c3cb 100644
--- a/test/compose/two_networks/tests.sh
+++ b/test/compose/two_networks/tests.sh
@@ -1,9 +1,6 @@
 # -*- bash -*-
 
-ctr_name="two_networks_con1_1"
-if [ "$TEST_FLAVOR" = "compose_v2" ]; then
-    ctr_name="two_networks-con1-1"
-fi
+ctr_name="two_networks-con1-1"
 podman container inspect "$ctr_name" --format '{{len .NetworkSettings.Networks}}'
 is "$output" "2" "$testname : Container is connected to both networks"
 podman container inspect "$ctr_name" --format '{{.NetworkSettings.Networks}}'
diff --git a/test/compose/uptwice/tests.sh b/test/compose/uptwice/tests.sh
index 0bf1b12146..5001eb7a03 100644
--- a/test/compose/uptwice/tests.sh
+++ b/test/compose/uptwice/tests.sh
@@ -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
 # no unexpected warning/errors and the normal messages are send on stderr as
 # 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"
-fi
+expected="Container uptwice-app-1  Recreate${NL}Container uptwice-app-1  Recreated${NL}Container uptwice-app-1  Starting${NL}Container uptwice-app-1  Started"
 is "$output" "$expected" "no error output in compose up (#15580)"