Skip to content

Commit e668a33

Browse files
authored
Merge pull request #943 from HernandoR/fix/multi-sub-composes
Fix the test_include for multi subcomposes
2 parents 5d4de80 + 0065082 commit e668a33

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

tests/test_podman_compose_include.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,18 @@ def test_podman_compose_include(self):
4444
'"{{.ID}}"',
4545
]
4646

47-
command_down = ["podman", "rm", "--force", "CONTAINER_ID"]
47+
command_down = ["podman", "rm", "--force"]
4848

4949
self.run_subprocess_assert_returncode(command_up)
5050
out, _ = self.run_subprocess_assert_returncode(command_check_container)
51-
self.assertEqual(out, b'"localhost/nopush/podman-compose-test:latest"\n"localhost/nopush/podman-compose-test:latest"\n')
51+
expected_output = b'"localhost/nopush/podman-compose-test:latest"\n' * 2
52+
self.assertEqual(out, expected_output)
5253
# Get container ID to remove it
5354
out, _ = self.run_subprocess_assert_returncode(command_container_id)
5455
self.assertNotEqual(out, b"")
55-
container_id = out.decode().strip().replace('"', "")
56-
command_down[3] = container_id
56+
container_ids = out.decode().strip().split("\n")
57+
container_ids = [container_id.replace('"', "") for container_id in container_ids]
58+
command_down.extend(container_ids)
5759
out, _ = self.run_subprocess_assert_returncode(command_down)
5860
# cleanup test image(tags)
5961
self.assertNotEqual(out, b"")

0 commit comments

Comments
 (0)