emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that root symlinks in void are never removed or detected as obsoletes.

Browse Source 
Added/improved test cases to detect those conditions work as expected.
This commit is contained in:
Juan RP
2014-03-31 10:16:18 +02:00
parent ab0f928cca
commit 4530c79bb2
5 changed files with 91 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/xbps/libxbps/shell/obsoletefiles_test.sh
View File

@@ -50,6 +50,58 @@ reinstall_obsoletes_body() {
atf_check_equal $rv 0
}
# 2- make sure that root symlinks aren't detected as obsoletes on upgrades.
atf_test_case root_symlinks_update
root_symlinks_update_head() {
atf_set "descr" "Test that root symlinks aren't obsoletes on update"
}
root_symlinks_update_body() {
mkdir repo
mkdir -p pkg_A/usr/bin pkg_A/usr/sbin pkg_A/usr/lib pkg_A/var pkg_A/run
touch -f pkg_A/usr/bin/foo
ln -sfr pkg_A/usr/bin pkg_A/bin
ln -sfr pkg_A/usr/sbin pkg_A/sbin
ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
ln -sfr pkg_A/run pkg_A/var/run
cd repo
xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
atf_check_equal $? 0
rm -rf ../pkg_A
xbps-rindex -a *.xbps
atf_check_equal $? 0
xbps-install -r root -C null.conf --repository=$PWD -yd foo
atf_check_equal $? 0
cd ..
mkdir -p pkg_A/usr/bin
touch -f pkg_A/usr/bin/blah
cd repo
xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A
atf_check_equal $? 0
rm -rf ../pkg_A
xbps-rindex -a *.xbps
atf_check_equal $? 0
xbps-install -r root -C null.conf --repository=$PWD -yuvd foo
atf_check_equal $? 0
rv=1
if [ -h root/bin -a -h root/sbin -a -h root/usr/lib32 -a -h root/usr/lib64 -a -h root/var/run ]; then
rv=0
fi
ls -l root
ls -l root/usr
ls -l root/var
atf_check_equal $rv 0
}
atf_init_test_cases() {
atf_add_test_case reinstall_obsoletes
atf_add_test_case root_symlinks_update
}

14
tests/xbps/libxbps/shell/remove_test.sh
View File

@@ -8,12 +8,20 @@ keep_base_symlinks_head() {
}
keep_base_symlinks_body() {
mkdir -p root/usr/bin
mkdir -p root/usr/bin root/usr/lib root/run root/var
ln -sfr root/usr/bin root/bin
ln -sfr root/usr/lib root/lib
ln -sfr root/usr/lib root/usr/lib32
ln -sfr root/usr/lib root/usr/lib64
ln -sfr root/run root/var/run
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/bin
mkdir -p pkg_A/usr/bin pkg_A/bin pkg_A/usr/lib pkg_A/var
touch -f pkg_A/usr/bin/foo
ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
ln -sfr /run pkg_A/var/run
cd some_repo
xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
atf_check_equal $? 0
@@ -24,7 +32,7 @@ keep_base_symlinks_body() {
atf_check_equal $? 0
xbps-remove -r root -y foo
atf_check_equal $? 0
if [ -h root/bin ]; then
if [ -h root/bin -a -h root/lib -a -h root/usr/lib32 -a -h root/usr/lib64 -a -h root/var/run ]; then
rv=0
else
rv=1