diff options
| -rw-r--r-- | .papr.yml | 6 | ||||
| -rw-r--r-- | contrib/python/podman/Makefile | 2 | ||||
| -rw-r--r-- | contrib/python/podman/test/test_containers.py | 19 | ||||
| -rw-r--r-- | contrib/python/podman/test/test_tunnel.py | 14 |
4 files changed, 26 insertions, 15 deletions
@@ -9,7 +9,7 @@ host: ram: 8192 cpus: 4 required: true -timeout: 120m +timeout: 90m tests: - CONTAINER_RUNTIME="podman" sh .papr_prepare.sh @@ -35,7 +35,7 @@ extra-repos: required: true -timeout: 120m +timeout: 90m tests: - sh .papr_prepare.sh @@ -63,7 +63,7 @@ tests: - CONTAINER_RUNTIME="podman" sh .papr_prepare.sh required: false -timeout: 120m +timeout: 90m context: "Fedora fedora/28/cloud Podman" --- diff --git a/contrib/python/podman/Makefile b/contrib/python/podman/Makefile index 7096f6152..e7e365a9c 100644 --- a/contrib/python/podman/Makefile +++ b/contrib/python/podman/Makefile @@ -11,7 +11,7 @@ lint: .PHONY: integration integration: - test/test_runner.sh + test/test_runner.sh -v .PHONY: install install: diff --git a/contrib/python/podman/test/test_containers.py b/contrib/python/podman/test/test_containers.py index 167aae68b..70221e33d 100644 --- a/contrib/python/podman/test/test_containers.py +++ b/contrib/python/podman/test/test_containers.py @@ -1,6 +1,7 @@ import os import signal import unittest +from pathlib import Path from test.podman_testcase import PodmanTestCase from test.retry_decorator import retry @@ -219,13 +220,19 @@ class TestContainers(PodmanTestCase): self.assertTrue(ctnr.status, 'running') # creating cgoups can be flakey - @retry(podman.libs.errors.ErrorOccurred, tries=16, delay=2, print_=print) + @retry(podman.libs.errors.ErrorOccurred, tries=4, delay=2, print_=print) def test_stats(self): - self.assertTrue(self.alpine_ctnr.running) - - actual = self.alpine_ctnr.stats() - self.assertEqual(self.alpine_ctnr.id, actual.id) - self.assertEqual(self.alpine_ctnr.names, actual.name) + try: + self.assertTrue(self.alpine_ctnr.running) + + actual = self.alpine_ctnr.stats() + self.assertEqual(self.alpine_ctnr.id, actual.id) + self.assertEqual(self.alpine_ctnr.names, actual.name) + except Exception: + info = Path('/proc/self/mountinfo') + with info.open() as fd: + print('{} {}'.format(self.alpine_ctnr.id, info)) + print(fd.read()) def test_logs(self): self.assertTrue(self.alpine_ctnr.running) diff --git a/contrib/python/podman/test/test_tunnel.py b/contrib/python/podman/test/test_tunnel.py index 8ee4b1052..9a33e76cd 100644 --- a/contrib/python/podman/test/test_tunnel.py +++ b/contrib/python/podman/test/test_tunnel.py @@ -1,5 +1,6 @@ from __future__ import absolute_import +import logging import time import unittest from unittest.mock import MagicMock, patch @@ -66,16 +67,19 @@ class TestTunnel(unittest.TestCase): ) tunnel = Tunnel(context).bore() - cmd = [ - 'ssh', - '-fNT', - '-q', + cmd = ['ssh', '-fNT'] + if logging.getLogger().getEffectiveLevel() == logging.DEBUG: + cmd.append('-v') + else: + cmd.append('-q') + + cmd.extend(( '-L', '{}:{}'.format(context.local_socket, context.remote_socket), '-i', context.identity_file, '{}@{}'.format(context.username, context.hostname), - ] + )) mock_finalize.assert_called_once_with(tunnel, tunnel.close) mock_exists.assert_called_once_with(context.local_socket) |