diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/compose/test-compose | 8 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 1 | ||||
| -rw-r--r-- | test/system/001-basic.bats | 13 |
3 files changed, 18 insertions, 4 deletions
diff --git a/test/compose/test-compose b/test/compose/test-compose index c4c484190..46ca80321 100755 --- a/test/compose/test-compose +++ b/test/compose/test-compose @@ -173,15 +173,16 @@ function test_port() { if [ $curl_rc -ne 0 ]; then _show_ok 0 "$testname - curl (port $port) failed with status $curl_rc" - # FIXME: is this useful? What else can we do to diagnose? - echo "# docker-compose logs:" - docker-compose logs echo "# podman ps -a:" $PODMAN_BIN --root $WORKDIR/root --runroot $WORKDIR/runroot ps -a if type -p ss; then echo "# ss -tulpn:" ss -tulpn + echo "# podman unshare --rootless-cni ss -tulpn:" + $PODMAN_BIN --root $WORKDIR/root --runroot $WORKDIR/runroot unshare --rootless-cni ss -tulpn fi + echo "# cat $WORKDIR/server.log:" + cat $WORKDIR/server.log return fi @@ -212,6 +213,7 @@ function start_service() { cp /etc/cni/net.d/*podman*conflist $WORKDIR/cni/ $PODMAN_BIN \ + --log-level debug \ --root $WORKDIR/root \ --runroot $WORKDIR/runroot \ --cgroup-manager=systemd \ diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 41afd9f75..e479b88cc 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1970,7 +1970,6 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`}) }) It("podman play kube applies log driver to containers", func() { - Skip("need to verify images have correct packages for journald") pod := getPod() err := generateKubeYaml("pod", pod, kubeYaml) Expect(err).To(BeNil()) diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats index 081bb1171..35107f0a0 100644 --- a/test/system/001-basic.bats +++ b/test/system/001-basic.bats @@ -111,4 +111,17 @@ function setup() { is "$output" "you found me" "sample invocation of 'jq'" } +@test "podman --log-level recognizes log levels" { + run_podman 1 --log-level=telepathic info + is "$output" 'Log Level "telepathic" is not supported.*' + run_podman --log-level=trace info + run_podman --log-level=debug info + run_podman --log-level=info info + run_podman --log-level=warn info + run_podman --log-level=warning info + run_podman --log-level=error info + run_podman --log-level=fatal info + run_podman --log-level=panic info +} + # vim: filetype=sh |