ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-15 08:40:34 +03:00
Code Issues Projects Releases Wiki Activity

tests: journal_lock: fix test_obtain_lock_with_tmpdir_ro()

Browse Source 
* Set `tmpdir` properly for this test.
* Do **NOT** unset `JournalLock.journal_dir_lockfile_name` on release, as
  this is needed to remove the file
* Ensure prior test(s) release their locks, *and* remove the file.
This commit is contained in:
Athanasius 2022-09-05 12:39:03 +01:00
parent 27d93b5f31
commit ddf6669f35
No known key found for this signature in database
GPG Key ID: 8C392035DD80FD62
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
journal_lock.py
View File

@ -182,7 +182,9 @@ class JournalLock:
if hasattr(self, 'journal_dir_lockfile'): if hasattr(self, 'journal_dir_lockfile'):
self.journal_dir_lockfile.close() self.journal_dir_lockfile.close()
self.journal_dir_lockfile_name = None # Doing this makes it impossible for tests to ensure the file
# is removed as a part of cleanup. So don't.
# self.journal_dir_lockfile_name = None
# Avoids type hint issues, see 'declaration' in JournalLock.__init__() # Avoids type hint issues, see 'declaration' in JournalLock.__init__()
# self.journal_dir_lockfile = None # self.journal_dir_lockfile = None

13
tests/journal_lock.py/test_journal_lock.py
View File

@ -200,10 +200,15 @@ class TestJournalLock:
locked = jlock.obtain_lock() locked = jlock.obtain_lock()
assert locked == JournalLockResult.LOCKED assert locked == JournalLockResult.LOCKED
assert jlock.locked assert jlock.locked
assert jlock.release_lock()
# Cleanup, to avoid side-effect on other tests
os.unlink(str(jlock.journal_dir_lockfile_name))
def test_obtain_lock_with_tmpdir_ro(self, mock_journaldir: py_path_local_LocalPath): def test_obtain_lock_with_tmpdir_ro(self, mock_journaldir: py_path_local_LocalPath):
"""Test JournalLock.obtain_lock() with read-only tmpdir.""" """Test JournalLock.obtain_lock() with read-only tmpdir."""
tmpdir = mock_journaldir tmpdir = str(mock_journaldir.getbasetemp())
print(f'{tmpdir=}')
# Make tmpdir read-only ? # Make tmpdir read-only ?
if sys.platform == 'win32': if sys.platform == 'win32':
@ -214,7 +219,7 @@ class TestJournalLock:
# Fetch user details # Fetch user details
winuser, domain, type = win32security.LookupAccountName("", os.environ.get('USERNAME')) winuser, domain, type = win32security.LookupAccountName("", os.environ.get('USERNAME'))
# Fetch the current security of tmpdir for that user. # Fetch the current security of tmpdir for that user.
sd = win32security.GetFileSecurity(str(tmpdir), win32security.DACL_SECURITY_INFORMATION) sd = win32security.GetFileSecurity(tmpdir, win32security.DACL_SECURITY_INFORMATION)
dacl = sd.GetSecurityDescriptorDacl() # instead of dacl = win32security.ACL() dacl = sd.GetSecurityDescriptorDacl() # instead of dacl = win32security.ACL()
# Add Write to Denied list # Add Write to Denied list
@ -225,7 +230,7 @@ class TestJournalLock:
dacl.AddAccessDeniedAce(win32security.ACL_REVISION, con.FILE_WRITE_DATA, winuser) dacl.AddAccessDeniedAce(win32security.ACL_REVISION, con.FILE_WRITE_DATA, winuser)
# Apply that change. # Apply that change.
sd.SetSecurityDescriptorDacl(1, dacl, 0) # may not be necessary sd.SetSecurityDescriptorDacl(1, dacl, 0) # may not be necessary
win32security.SetFileSecurity(str(tmpdir), win32security.DACL_SECURITY_INFORMATION, sd) win32security.SetFileSecurity(tmpdir, win32security.DACL_SECURITY_INFORMATION, sd)
else: else:
import stat import stat
@ -251,7 +256,7 @@ class TestJournalLock:
dacl.DeleteAce(i) dacl.DeleteAce(i)
# Apply that change. # Apply that change.
sd.SetSecurityDescriptorDacl(1, dacl, 0) # may not be necessary sd.SetSecurityDescriptorDacl(1, dacl, 0) # may not be necessary
win32security.SetFileSecurity(str(tmpdir), win32security.DACL_SECURITY_INFORMATION, sd) win32security.SetFileSecurity(tmpdir, win32security.DACL_SECURITY_INFORMATION, sd)
break break
i += 1 i += 1