From 3ac5810d35bbd32a9c522a89909e0ed1cb35aee6 Mon Sep 17 00:00:00 2001 From: Jiri Kortus Date: Tue, 5 May 2020 14:09:19 +0200 Subject: [PATCH] [tests] Fix repos files handling in test_repos_sanity.sh Related: rhbz#1828808 --- tests/cli/test_repos_sanity.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/cli/test_repos_sanity.sh b/tests/cli/test_repos_sanity.sh index 9a89b84f..3fd320c2 100755 --- a/tests/cli/test_repos_sanity.sh +++ b/tests/cli/test_repos_sanity.sh @@ -10,9 +10,9 @@ CLI="${CLI:-./src/bin/composer-cli}" rlJournalStart rlPhaseStartSetup - repodir_backup=$(mktemp -d composerrepos-XXXXX) + # as opposed to RHEL-8, the system repos aren't copied over to lorax-composes repos.d, + # directory, so handling of those files was removed in RHEL-7 test (see rhbz#1830897) composer_stop - rlRun -t -c "mv /var/lib/lorax/composer/repos.d/* $repodir_backup" rlPhaseEnd rlPhaseStartTest "Run lorax-composer with --no-system-repos option and empty repos.d" @@ -71,8 +71,7 @@ gpgcheck=0 rlPhaseStartCleanup $CLI compose delete $UUID MANUAL=1 composer_stop - rlRun -t -c "rm -rf /var/lib/lorax/composer/repos.d" - rlRun -t -c "mv $repodir_backup /var/lib/lorax/composer/repos.d" + rlRun -t -c "rm -rf /var/lib/lorax/composer/repos.d/*" composer_start rlPhaseEnd rlJournalEnd