fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-20 06:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

NoneType guard, defaulting to /tmp

Browse Source
This commit is contained in:
skelly37
2022-06-16 11:29:15 +02:00
parent 5ff83bb84d
commit b83ce3f2d8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
picard/util/pipe.py
View File

@@ -135,9 +135,9 @@ class Pipe:
self.__BROKEN_PIPE_ERROR_CODE: int = 109
# mocking for test purposes
elif self.__is_mac:
self.PIPE_MAC_DIR = os.path.join(os.environ.get("HOME", "."), self.PIPE_MAC_DIR)
self.PIPE_MAC_DIR = os.path.join(os.environ.get("HOME", "/tmp/test_dir"), self.PIPE_MAC_DIR)
else:
self.PIPE_UNIX_FALLBACK_DIR = os.path.join(os.environ.get("HOME", "."), self.PIPE_UNIX_FALLBACK_DIR)
self.PIPE_UNIX_FALLBACK_DIR = os.path.join(os.environ.get("HOME", "/tmp/test_dir"), self.PIPE_UNIX_FALLBACK_DIR)
self.path: str = self.__generate_filename(app_name, app_version)

4
test/test_util_pipe.py
View File

@@ -82,9 +82,11 @@ class TestPipe(PicardTestCase):
def test_filename_generation_unix(self):
handler = pipe.Pipe(PICARD_APP_NAME, PICARD_FANCY_VERSION_STR)
UNIX_PATHS = {
join(handler.PIPE_UNIX_DIR, self.SUFFIX),
join(handler.PIPE_UNIX_FALLBACK_DIR, self.SUFFIX)
}
# None guard
if handler.PIPE_UNIX_DIR:
UNIX_PATHS.add(handler.PIPE_UNIX_DIR)
self.assertIn(handler.path, UNIX_PATHS)
def test_pipe_protocol(self):