extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-05-30 15:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1205 from mokibit/add-missing-init-py-files

Browse Source 
tests/integration: Add missing __init__.py files to actually run tests and fix the broken ones
This commit is contained in:
Povilas Kanapickas 2025-05-26 22:27:48 +03:00 committed by GitHub
commit 0dcc864fdd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/integration/lifetime/__init__.py Normal file
View File

34
tests/integration/lifetime/test_lifetime.py
View File

@ -2,6 +2,7 @@
import os
import time
import unittest
from parameterized import parameterized
@ -85,15 +86,14 @@ class TestLifetime(unittest.TestCase, RunSubprocessMixin):
"container1",
])
for _ in range(0, 3):
self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
compose_path,
"up",
"-d",
"container2",
])
self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
compose_path,
"up",
"-d",
"container2",
])
out, _ = self.run_subprocess_assert_returncode([
podman_compose_path(),
@ -105,6 +105,7 @@ class TestLifetime(unittest.TestCase, RunSubprocessMixin):
self.assertEqual(out, b"test1\n")
# "restart: always" keeps restarting container until its removal
out, _ = self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
@ -113,13 +114,22 @@ class TestLifetime(unittest.TestCase, RunSubprocessMixin):
"container2",
])
# BUG: container should be started 3 times, not 4.
self.assertEqual(out, b"test2\n" * 4)
if not out.startswith(b"test2\ntest2"):
time.sleep(1)
out, _ = self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
compose_path,
"logs",
"container2",
])
self.assertTrue(out.startswith(b"test2\ntest2"))
finally:
out, _ = self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
compose_path,
"down",
"-t",
"0",
])

2
tests/integration/lifetime/up_single_container_many_times/docker-compose.yml
View File

@ -5,5 +5,5 @@ services:
command: ["/bin/bash", "-c", "echo test1; sleep infinity"]
container2:
image: nopush/podman-compose-test
restart: never
restart: always
command: ["/bin/bash", "-c", "echo test2"]

2
tests/integration/lifetime/up_single_container_many_times_with_ports/docker-compose.yml
View File

@ -6,6 +6,6 @@ services:
command: ["/bin/bash", "-c", "echo test1; sleep infinity"]
container2:
image: nopush/podman-compose-test
restart: never
restart: always
ports: "9002:9002"
command: ["/bin/bash", "-c", "echo test2"]

0
tests/integration/nets_test3/__init__.py Normal file
View File

0
tests/integration/nets_test_ip/__init__.py Normal file
View File

0
tests/integration/no_services/__init__.py Normal file
View File

0
tests/integration/seccomp/__init__.py Normal file
View File

0
tests/integration/secrets/__init__.py Normal file
View File

0
tests/integration/selinux/__init__.py Normal file
View File

0
tests/integration/service_scale/__init__.py Normal file
View File

2
tests/integration/service_scale/scaleup_deploy_replicas_parameter/docker-compose.yml
View File

@ -6,4 +6,4 @@ services:
tty: true
deploy:
mode: replicated
replicas: 2
replicas: 3

47
tests/integration/service_scale/test_podman_compose_scale.py
View File

@ -33,6 +33,15 @@ class TestComposeScale(unittest.TestCase, RunSubprocessMixin):
])
self.assertEqual(len(output.splitlines()), 2)
finally:
self.run_subprocess_assert_returncode([
"podman",
"rm",
"--force",
"-t",
"0",
"podman-compose_service1_1",
"podman-compose_service1_2",
])
self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
@ -56,12 +65,22 @@ class TestComposeScale(unittest.TestCase, RunSubprocessMixin):
output, _, return_code = self.run_subprocess([
podman_compose_path(),
"-f",
compose_yaml_path("scaleup_scale_parameter"),
compose_yaml_path("scaleup_deploy_replicas_parameter"),
"ps",
"-q",
])
self.assertEqual(len(output.splitlines()), 2)
self.assertEqual(len(output.splitlines()), 3)
finally:
self.run_subprocess_assert_returncode([
"podman",
"rm",
"--force",
"-t",
"0",
"podman-compose_service1_1",
"podman-compose_service1_2",
"podman-compose_service1_3",
])
self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",
@ -89,18 +108,34 @@ class TestComposeScale(unittest.TestCase, RunSubprocessMixin):
"up",
"-d",
"--scale",
"service1=2",
"service1=4",
])
self.assertEqual(return_code, 0)
# error code 125 is expected as podman-compose complains about already used name
# "podman-compose_service1_1" for the 1st container
# Nevertheless, following containers are still created to scale as expected
# (in test case till 3 containers)
self.assertEqual(return_code, 125)
output, _, return_code = self.run_subprocess([
podman_compose_path(),
"-f",
compose_yaml_path("scaleup_scale_parameter"),
compose_yaml_path('scaleup_cli'),
"ps",
"-q",
])
self.assertEqual(len(output.splitlines()), 2)
self.assertEqual(len(output.splitlines()), 4)
finally:
self.run_subprocess_assert_returncode([
"podman",
"rm",
"--force",
"-t",
"0",
"podman-compose_service1_1",
"podman-compose_service1_2",
"podman-compose_service1_3",
"podman-compose_service1_4",
])
self.run_subprocess_assert_returncode([
podman_compose_path(),
"-f",

0
tests/integration/uidmaps/__init__.py Normal file
View File