forked from Mirror/pmbootstrap
5e7de79b90
On my system, /proc/mounts sometimes contains a line like ``` udev /media/zhuowei/redhd/pmbootstrap/chroot_native/dev/loop0p2\040(deleted) devtmpfs rw,relatime,size=1959476k,nr_inodes=489869,mode=755 0 0 ``` The "\040(deleted)" text confuses `pmbootstrap shutdown`. Remove the suffix if we find it in a /proc/mounts entry. This fixes #545.
46 lines
1.6 KiB
Python
46 lines
1.6 KiB
Python
"""
|
|
Copyright 2017 Oliver Smith
|
|
|
|
This file is part of pmbootstrap.
|
|
|
|
pmbootstrap is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
pmbootstrap is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
|
|
"""
|
|
import os
|
|
import sys
|
|
|
|
# Import from parent directory
|
|
sys.path.append(os.path.realpath(
|
|
os.path.join(os.path.dirname(__file__) + "/..")))
|
|
import pmb.helpers.mount
|
|
|
|
|
|
def test_umount_all_list(tmpdir):
|
|
# Write fake mounts file
|
|
fake_mounts = str(tmpdir + "/mounts")
|
|
with open(fake_mounts, "w") as handle:
|
|
handle.write("source /test/var/cache\n")
|
|
handle.write("source /test/home/pmos/packages\n")
|
|
handle.write("source /test\n")
|
|
handle.write("source /test/proc\n")
|
|
handle.write("source /test/dev/loop0p2\\040(deleted)\n")
|
|
|
|
ret = pmb.helpers.mount.umount_all_list("/no/match", fake_mounts)
|
|
assert ret == []
|
|
|
|
ret = pmb.helpers.mount.umount_all_list("/test/var/cache", fake_mounts)
|
|
assert ret == ["/test/var/cache"]
|
|
|
|
ret = pmb.helpers.mount.umount_all_list("/test", fake_mounts)
|
|
assert ret == ["/test/var/cache", "/test/proc", "/test/home/pmos/packages",
|
|
"/test/dev/loop0p2", "/test"]
|