summaryrefslogtreecommitdiff
path: root/contrib/python/test/test_runner.sh
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2018-05-24 13:44:04 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-25 09:31:21 +0000
commit0a4ade1c175d3188ad55d22d751a86c96e060a44 (patch)
tree9bfb3414119e931fd715c6d3002c0e357fce7e18 /contrib/python/test/test_runner.sh
parent684b544e9c45129a3d8112cfab22526440d8fd13 (diff)
downloadpodman-0a4ade1c175d3188ad55d22d751a86c96e060a44.tar.gz
podman-0a4ade1c175d3188ad55d22d751a86c96e060a44.tar.bz2
podman-0a4ade1c175d3188ad55d22d751a86c96e060a44.zip
Implement python podman create and start
- Added alias 'container()' to image model for CreateContainer() - Fixed return in containers_create.go to wrap error in varlink exception - Added a wait time to container.kill(), number of seconds to wait for the container to change state - Refactored cached_property() to use system libraries - Refactored tests to speed up performance Signed-off-by: Jhon Honce <jhonce@redhat.com> Closes: #821 Approved by: rhatdan
Diffstat (limited to 'contrib/python/test/test_runner.sh')
-rwxr-xr-xcontrib/python/test/test_runner.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/python/test/test_runner.sh b/contrib/python/test/test_runner.sh
index ba55a7237..1cccbe1f5 100755
--- a/contrib/python/test/test_runner.sh
+++ b/contrib/python/test/test_runner.sh
@@ -40,7 +40,7 @@ fi
export PATH=../../bin:$PATH
function showlog {
- [ -s "$1" ] && (echo $1 =====; cat "$1")
+ [ -s "$1" ] && (echo $1 =====; cat "$1"; echo)
}
# Need a location to store the podman socket
@@ -109,8 +109,9 @@ else
fi
set +x
-pkill podman
+pkill -9 podman
pkill -9 conmon
+showlog /tmp/test_runner.output
showlog /tmp/alpine.log
showlog /tmp/busybox.log