Mirror/pmbootstrap
1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-24 21:15:10 +03:00
Code Issues Wiki Activity

Fix #166: pmbootstrap shutdown: umount deep folder levels first (#274)

Browse source 
* Refactored `umount_all` to get the list of folders to be umounted from
  `umount_all_list`, so we can test that function in a test case.
* Adjusted `umount_all_list` to return the deep folder levels first
* Added a testcase for that
* Remove redundant calls to `umount_all()` (which were from a time before
  `pmbootstrap` was released, in which failing commands did not cause
  `pmbootstrap` to raise an exception)
This commit is contained in:
Oliver Smith 2017-07-27 18:14:02 +00:00 • committed by GitHub
parent 3be2fce72f
commit 10bf08dca1
3 changed files with 73 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
test/test_mount.py Normal file
View file

@ -0,0 +1,45 @@
"""
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.abspath(
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/user/packages\n")
handle.write("source /test\n")
handle.write("source /test/proc\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/user/packages",
"/test"]