mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-08 13:09:17 +00:00
Code Activity

backup tests

Browse Source
This commit is contained in:
deadc0de6
2023-09-21 15:01:16 +02:00
committed by deadc0de
parent 70b742a9f3
commit 4e07d2a909
3 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotdrop/installer.py
View File

@@ -477,6 +477,8 @@ class Installer:
return False, 'aborted' return False, 'aborted'
# remove symlink # remove symlink
if self.backup and not os.path.isdir(dst):
self._backup(dst)
overwrite = True overwrite = True
try: try:
removepath(dst) removepath(dst)

2
dotdrop/utils.py
View File

@@ -175,6 +175,8 @@ def removepath(path, logger=None):
return return
LOG.err(err) LOG.err(err)
raise OSError(err) raise OSError(err)
if logger:
logger.dbg(f'removing {path}')
try: try:
if os.path.islink(path) or os.path.isfile(path): if os.path.islink(path) or os.path.isfile(path):
os.unlink(path) os.unlink(path)

30
tests-ng/backup.sh vendored
View File

@@ -151,7 +151,6 @@ grep_or_fail original "${tmpd}"/tree/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/template.dotdropbak grep_or_fail original "${tmpd}"/tree/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail p1 "${tmpd}"/template grep_or_fail p1 "${tmpd}"/template
grep_or_fail modified "${tmpd}"/dir/sub grep_or_fail modified "${tmpd}"/dir/sub
grep_or_fail p1 "${tmpd}"/dir/template grep_or_fail p1 "${tmpd}"/dir/template
@@ -167,28 +166,13 @@ clear_dotpath
clear_fs clear_fs
create_dotpath create_dotpath
create_fs create_fs
tree "${tmps}"/dotfiles
tree "${tmpd}"
cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 --verbose cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 --verbose
# checks # checks
[ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1 [ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1
[ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1 [ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1
[ ! -e "${tmpd}"/dir/sub.dotdropbak ] && echo "${pre} dir sub backup not found" && exit 1
[ ! -e "${tmpd}"/dir/template.dotdropbak ] && echo "${pre} dir template backup not found" && exit 1
[ ! -e "${tmpd}"/tree/file.dotdropbak ] && echo "${pre} tree file backup not found" && exit 1
[ ! -e "${tmpd}"/tree/template.dotdropbak ] && echo "${pre} tree template backup not found" && exit 1
[ ! -e "${tmpd}"/tree/sub/file.dotdropbak ] && echo "${pre} tree sub file backup not found" && exit 1
[ ! -e "${tmpd}"/tree/sub/template.dotdropbak ] && echo "${pre} tree sub template backup not found" && exit 1
grep_or_fail original "${tmpd}"/file.dotdropbak grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail original "${tmpd}"/template.dotdropbak grep_or_fail original "${tmpd}"/template.dotdropbak
grep_or_fail original "${tmpd}"/dir/sub.dotdropbak
grep_or_fail original "${tmpd}"/dir/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail p1 "${tmpd}"/template grep_or_fail p1 "${tmpd}"/template
grep_or_fail modified "${tmpd}"/dir/sub grep_or_fail modified "${tmpd}"/dir/sub
grep_or_fail p1 "${tmpd}"/dir/template grep_or_fail p1 "${tmpd}"/dir/template
@@ -209,21 +193,8 @@ cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 --verbose
# checks # checks
[ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1 [ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1
[ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1 [ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1
[ ! -e "${tmpd}"/dir/sub.dotdropbak ] && echo "${pre} dir sub backup not found" && exit 1
[ ! -e "${tmpd}"/dir/template.dotdropbak ] && echo "${pre} dir template backup not found" && exit 1
[ ! -e "${tmpd}"/tree/file.dotdropbak ] && echo "${pre} tree file backup not found" && exit 1
[ ! -e "${tmpd}"/tree/template.dotdropbak ] && echo "${pre} tree template backup not found" && exit 1
[ ! -e "${tmpd}"/tree/sub/file.dotdropbak ] && echo "${pre} tree sub file backup not found" && exit 1
[ ! -e "${tmpd}"/tree/sub/template.dotdropbak ] && echo "${pre} tree sub template backup not found" && exit 1
grep_or_fail original "${tmpd}"/file.dotdropbak grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail original "${tmpd}"/template.dotdropbak grep_or_fail original "${tmpd}"/template.dotdropbak
grep_or_fail original "${tmpd}"/dir/sub.dotdropbak
grep_or_fail original "${tmpd}"/dir/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail p1 "${tmpd}"/template grep_or_fail p1 "${tmpd}"/template
grep_or_fail modified "${tmpd}"/dir/sub grep_or_fail modified "${tmpd}"/dir/sub
grep_or_fail p1 "${tmpd}"/dir/template grep_or_fail p1 "${tmpd}"/dir/template
@@ -258,7 +229,6 @@ grep_or_fail original "${tmpd}"/tree/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/template.dotdropbak grep_or_fail original "${tmpd}"/tree/template.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
grep_or_fail original "${tmpd}"/file.dotdropbak
grep_or_fail p1 "${tmpd}"/template grep_or_fail p1 "${tmpd}"/template
grep_or_fail modified "${tmpd}"/dir/sub grep_or_fail modified "${tmpd}"/dir/sub
grep_or_fail p1 "${tmpd}"/dir/template grep_or_fail p1 "${tmpd}"/dir/template