opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10950 from edsantiago/python_flake_fix

Browse Source 
APIv2 (python) tests: fix flake
This commit is contained in:
OpenShift Merge Robot
2021-07-16 11:43:44 -04:00
committed by GitHub
parent 3ef124b03f be51173ed3
commit 1961769edf
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/python/docker/__init__.py
View File

@ -27,7 +27,7 @@ class Podman(object):
# No support for tmpfs (/tmp) or extfs (/var/tmp) # No support for tmpfs (/tmp) or extfs (/var/tmp)
# self.cmd.append("--storage-driver=overlay") # self.cmd.append("--storage-driver=overlay")
if os.getenv("DEBUG"): if os.getenv("PODMAN_PYTHON_TEST_DEBUG"):
self.cmd.append("--log-level=debug") self.cmd.append("--log-level=debug")
self.cmd.append("--syslog=true") self.cmd.append("--syslog=true")

9
test/python/docker/compat/test_containers.py
View File

@ -140,7 +140,7 @@ class TestContainers(unittest.TestCase):
def test_remove_container_without_force(self): def test_remove_container_without_force(self):
# Validate current container count # Validate current container count
self.assertTrue(len(self.client.containers.list()), 1) self.assertEqual(len(self.client.containers.list()), 1)
# Remove running container should throw error # Remove running container should throw error
top = self.client.containers.get(TestContainers.topContainerId) top = self.client.containers.get(TestContainers.topContainerId)
@ -206,7 +206,6 @@ class TestContainers(unittest.TestCase):
self.assertEqual(len(ctnrs), 1) self.assertEqual(len(ctnrs), 1)
def test_copy_to_container(self): def test_copy_to_container(self):
self.skipTest("FIXME: #10948 - test is broken")
ctr: Optional[Container] = None ctr: Optional[Container] = None
try: try:
test_file_content = b"Hello World!" test_file_content = b"Hello World!"
@ -230,11 +229,11 @@ class TestContainers(unittest.TestCase):
ret, out = ctr.exec_run(["stat", "-c", "%u:%g", "/tmp/a.txt"]) ret, out = ctr.exec_run(["stat", "-c", "%u:%g", "/tmp/a.txt"])
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertTrue(out.startswith(b'1042:1043'), "assert correct uid/gid") self.assertEqual(out.rstrip(), b'1042:1043', "UID/GID of copied file")
ret, out = ctr.exec_run(["cat", "/tmp/a.txt"]) ret, out = ctr.exec_run(["cat", "/tmp/a.txt"])
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertTrue(out.startswith(test_file_content), "assert file content") self.assertEqual(out.rstrip(), test_file_content, "Content of copied file")
finally: finally:
if ctr is not None: if ctr is not None:
ctr.stop() ctr.stop()
@ -251,4 +250,4 @@ class TestContainers(unittest.TestCase):
volumes=["test_mount_preexisting_dir_vol:/workspace"]) volumes=["test_mount_preexisting_dir_vol:/workspace"])
ctr.start() ctr.start()
ret, out = ctr.exec_run(["stat", "-c", "%u:%g", "/workspace"]) ret, out = ctr.exec_run(["stat", "-c", "%u:%g", "/workspace"])
self.assertTrue(out.startswith(b'1042:1043'), "assert correct uid/gid") self.assertEqual(out.rstrip(), b'1042:1043', "UID/GID set in dockerfile")