almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

test_compose_tar: Fix docker test

Browse Source 
The docker phase always failed because `-ti` was passed even though the
the output was not a terminal.

Also remove the check for /usr/bin/docker in the setup phase. It didn't
test that the daemon was running. More importantly, it didn't abort the
test anwyay (and there doesn't seem to be a good way to do this in
beakerlib).
This commit is contained in:
Lars Karlitski 2019-05-20 11:49:17 +02:00 committed by Martin Pitt
parent 1ba2e6fd4b
commit 5f5a2d5337
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cli/test_compose_tar.sh
View File

@ -13,10 +13,6 @@ CLI="${CLI:-./src/bin/composer-cli}"
rlJournalStart rlJournalStart
rlPhaseStartSetup
rlAssertExists /usr/bin/docker
rlPhaseEnd
rlPhaseStartTest "compose start" rlPhaseStartTest "compose start"
rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"
UUID=`$CLI compose start example-http-server tar` UUID=`$CLI compose start example-http-server tar`
@ -43,7 +39,7 @@ rlJournalStart
rlRun -t -c "docker import $IMAGE composer/$UUID:latest" rlRun -t -c "docker import $IMAGE composer/$UUID:latest"
# verify we can run a container with this image # verify we can run a container with this image
rlRun -t -c "docker run -it --rm --entrypoint /usr/bin/cat composer/$UUID /etc/redhat-release" rlRun -t -c "docker run --rm --entrypoint /usr/bin/cat composer/$UUID /etc/redhat-release"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "Verify tar image with systemd-nspawn" rlPhaseStartTest "Verify tar image with systemd-nspawn"