Yet additional test fixes + normalization.

github-userx · May 17, 2019 · 5753f74 · 5753f74
1 parent d84605a
commit 5753f74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/redditdownloader/tests/unit/processing/wrappers/test_rel_file.py b/redditdownloader/tests/unit/processing/wrappers/test_rel_file.py
@@ -15,7 +15,7 @@ def test_invalid(self):
  with self.assertRaises(rel.RelError, msg="Failed to catch dangerous file escalation!"):
  rel.SanitizedRelFile(base='C://Users', file_path='t/../../nope.txt')
  with self.assertRaises(rel.RelError, msg="Failed to catch non-character filename!"):
- rel.SanitizedRelFile(base='C://Users', file_path=' . ./.')
+ rel.SanitizedRelFile(base='C://Users', file_path='  \n\t')
 
  def test_path_concat(self):
  """ Leading directory dots should be stripped in full paths """

diff --git a/redditdownloader/tools/ffmpeg_download.py b/redditdownloader/tools/ffmpeg_download.py
@@ -70,7 +70,7 @@ def _dl_binary(output_dir, verbose=True):
  raise Exception("Unable to download FFmpeg archive!")
 
  with ZipFile(output_zip.absolute(), 'r') as z:
- extracted = z.extract(_os_filename, path=output_dir)
+ extracted = abspath(z.extract(_os_filename, path=output_dir))
  if not extracted:
  raise Exception('Unable to extract FFmpeg binary!')
  st = os.stat(extracted)