arsenetar
/
send2trash
mirror of https://github.com/arsenetar/send2trash.git
1
0
Fork 0
Code Releases Activity

Change method for test symlink path generation

This commit is contained in:
Andrew Senetar 2021-08-21 16:00:50 -05:00
parent 007d84361a
commit 696aed558b
Signed by: arsenetar
GPG Key ID: C63300DCE48AB2F1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_plat_other.py
View File

@ -16,6 +16,7 @@ except ImportError:
from tempfile import mkdtemp, NamedTemporaryFile, mktemp from tempfile import mkdtemp, NamedTemporaryFile, mktemp
import shutil import shutil
import stat import stat
import uuid
if sys.platform != "win32": if sys.platform != "win32":
import send2trash.plat_other import send2trash.plat_other
@ -91,11 +92,9 @@ def gen_unicode_file():
assert op.exists(file) is True assert op.exists(file) is True
yield file yield file
# Cleanup trash files on supported platforms # Cleanup trash files on supported platforms
if sys.platform != "win32": if sys.platform != "win32" and op.exists(op.join(HOMETRASH, "files", name)):
# Remove trash files if they exist os.remove(op.join(HOMETRASH, "files", name))
if op.exists(op.join(HOMETRASH, "files", name)): os.remove(op.join(HOMETRASH, "info", name + ".trashinfo"))
os.remove(op.join(HOMETRASH, "files", name))
os.remove(op.join(HOMETRASH, "info", name + ".trashinfo"))
if op.exists(file): if op.exists(file):
os.remove(file) os.remove(file)
@ -186,10 +185,8 @@ def test_trash_topdir_failure(gen_ext_vol):
def test_trash_symlink(gen_ext_vol): def test_trash_symlink(gen_ext_vol):
# Use mktemp (race conditioney but no symlink equivalent) # Generating a random uuid named path for symlink
# Since is_parent uses realpath(), and our getdev uses is_parent, sl_dir = op.join(op.expanduser("~"), "s2t_" + str(uuid.uuid4()))
# this should work
sl_dir = mktemp(prefix="s2t", dir=op.expanduser("~"))
os.mkdir(op.join(gen_ext_vol[0].trash_topdir, "subdir"), 0o700) os.mkdir(op.join(gen_ext_vol[0].trash_topdir, "subdir"), 0o700)
file_path = op.join(gen_ext_vol[0].trash_topdir, "subdir", gen_ext_vol[1]) file_path = op.join(gen_ext_vol[0].trash_topdir, "subdir", gen_ext_vol[1])
touch(file_path) touch(file_path)