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. Moreover docker service isn't running by
default on RHEL-7, so it's necessary to start it first explicitly.

Related: rhbz#1720224
This commit is contained in:
Lars Karlitski 2019-05-20 11:49:17 +02:00 committed by Alexander Todorov
parent cdfdb651f7
commit fd2e1738ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cli/test_compose_tar.sh
View File

@ -15,6 +15,7 @@ CLI="${CLI:-./src/bin/composer-cli}"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertExists /usr/bin/docker rlAssertExists /usr/bin/docker
rlRun -t -c "systemctl restart docker"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "compose start" rlPhaseStartTest "compose start"
@ -43,7 +44,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"