keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/compose: Simplify test-rojig-e2e file search

Browse Source 
This test was relying on the order in which `find` reports matching path
names to find the right RPM. This was failing for me locally sometimes
because it matched the wrong RPM file. Fix this by just directly
referencing the full path name since we can.

Closes: #1491
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-08-07 10:46:48 -04:00 committed by Atomic Bot
parent dce98e4a53
commit 3891aa2563
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/compose-tests/test-rojig-e2e.sh
View File

@ -36,8 +36,7 @@ do_commit2rojig() {
echo "$(date): finished commit2rojig"
}
do_commit2rojig ${rev}
find rojig-output -name '*.rpm' | tee rpms.txt
assert_file_has_content rpms.txt 'fedora-atomic-host-42.0.*x86_64'
test -f rojig-output/x86_64/fedora-atomic-host-42.0-1.fc28.x86_64.rpm
ostree --repo=rojig-unpack-repo init --mode=bare-user
echo 'fsync=false' >> rojig-unpack-repo/config
@ -84,9 +83,7 @@ assert_file_has_content test-newpkg-list.txt 'test-newpkg-1.0-1.x86_64'
# Rojig version 42.1
do_commit2rojig ${newrev}
find rojig-output -name '*.rpm' | tee rpms.txt
assert_file_has_content rpms.txt 'fedora-atomic-host-42.1.*x86_64'
path=$(head -1 rpms.txt)
path=rojig-output/x86_64/fedora-atomic-host-42.1-1.fc28.x86_64.rpm
rpm -qp --requires ${path} > requires.txt
assert_file_has_content requires.txt 'glibc(.*) = '
assert_file_has_content requires.txt 'systemd(.*) = '