Skip to content

Commit

Permalink
Add some checks to catch test failure
Browse files Browse the repository at this point in the history
Really just checking that the setup is able to create test files so it
is known they were there then removed.
Windows tests really need verification of
recycle, which is not present.
  • Loading branch information
arsenetar committed Mar 18, 2021
1 parent f9fcdb8 commit 3565091
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 4 additions & 0 deletions tests/test_plat_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def testfile():
dir=op.expanduser("~"), prefix="send2trash_test", delete=False
)
file.close()
assert op.exists(file) is True
yield file
# Cleanup trash files on supported platforms
if sys.platform != "win32":
Expand All @@ -57,6 +58,7 @@ def testfiles():
)
)
[file.close() for file in files]
assert all([op.exists(file) for file in files]) is True
yield files
filenames = [op.basename(file.name) for file in files]
[os.remove(op.join(HOMETRASH, "files", filename)) for filename in filenames]
Expand Down Expand Up @@ -93,6 +95,7 @@ def testUnicodefile():
name = u"send2trash_tést1"
file = op.join(op.expanduser(b"~"), name.encode("utf-8"))
touch(file)
assert op.exists(file) is True
yield file
# Cleanup trash files on supported platforms
if sys.platform != "win32":
Expand Down Expand Up @@ -158,6 +161,7 @@ def testExtVol():
fileName = "test.txt"
filePath = op.join(volume.trashTopdir, fileName)
touch(filePath)
assert op.exists(filePath) is True
yield volume, fileName, filePath
volume.cleanup()

Expand Down
11 changes: 9 additions & 2 deletions tests/test_plat_win.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def _create_tree(path):
@pytest.fixture
def testdir(tmp_path):
dirname = "\\\\?\\" + str(tmp_path)
assert op.exists(dirname) is True
yield dirname
shutil.rmtree(dirname, ignore_errors=True)

Expand All @@ -34,6 +35,7 @@ def testdir(tmp_path):
def testfile(testdir):
file = op.join(testdir, "testfile.txt")
_create_tree(file)
assert op.exists(file) is True
yield file
# Note dir will cleanup the file

Expand All @@ -42,6 +44,7 @@ def testfile(testdir):
def testfiles(testdir):
files = [op.join(testdir, "testfile{}.txt".format(index)) for index in range(10)]
[_create_tree(file) for file in files]
assert all([op.exists(file) for file in files]) is True
yield files
# Note dir will cleanup the files

Expand Down Expand Up @@ -148,6 +151,7 @@ def longfile(longdir):
path = op.join(longdir, name + "{}.txt")
file = path.format("")
_create_tree(file)
assert op.exists(file) is True
yield file


Expand All @@ -157,11 +161,14 @@ def longfiles(longdir):
path = op.join(longdir, name + "{}.txt")
files = [path.format(index) for index in range(10)]
[_create_tree(file) for file in files]
assert all([op.exists(file) for file in files]) is True
yield files


# NOTE: both legacy and modern test "pass" on windows, but actually are not moving files to the
# recycle bin, this was tested on latest windows 10, thought to have worked previously
# NOTE: both legacy and modern test "pass" on windows, however sometimes with the same path
# they do not actually recycle files but delete them. Noticed this when testing with the
# recycle bin open, noticed later tests actually worked, modern version can actually detect
# when this happens but not stop it at this moment, and we need a way to verify it when testing.
def test_trash_long_file_modern(longfile):
_trash_file(longfile, s2t_modern)

Expand Down
2 changes: 2 additions & 0 deletions tests/test_script_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def file():
dir=op.expanduser("~"), prefix="send2trash_test", delete=False
)
file.close()
# Verify file was actually created
assert op.exists(file.name) is True
yield file.name
# Cleanup trash files on supported platforms
if sys.platform != "win32":
Expand Down

0 comments on commit 3565091

Please sign in to comment.