From c6ecc5e3a3d1011d7d79afd62b69f9dcfd7c008b Mon Sep 17 00:00:00 2001 From: Dan Puttick Date: Thu, 23 Feb 2017 23:09:00 -0500 Subject: [PATCH] Fix process_dir bug in filecheck tests --- bin/filecheck.py | 2 +- kittengroomer/helpers.py | 2 +- tests/test_filecheck.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/filecheck.py b/bin/filecheck.py index d1f6033..54be51a 100644 --- a/bin/filecheck.py +++ b/bin/filecheck.py @@ -576,7 +576,7 @@ class KittenGroomerFileCheck(KittenGroomerBase): self.process_file(srcpath, dstpath, relative_path) def run(self): - self.process_dir(self.src_root_dir, self.src_dst_dir) + self.process_dir(self.src_root_dir, self.dst_root_dir) def main(kg_implementation, description): diff --git a/kittengroomer/helpers.py b/kittengroomer/helpers.py index b20e6d1..e23d89d 100644 --- a/kittengroomer/helpers.py +++ b/kittengroomer/helpers.py @@ -60,7 +60,7 @@ class FileBase(object): else: try: mt = magic.from_file(self.src_path, mime=True) - # magic will always return something, even if it's just 'data' + # note: magic will always return something, even if it's just 'data' except UnicodeEncodeError as e: # FIXME: The encoding of the file is broken (possibly UTF-16) mt = '' diff --git a/tests/test_filecheck.py b/tests/test_filecheck.py index d53eded..b573a64 100644 --- a/tests/test_filecheck.py +++ b/tests/test_filecheck.py @@ -33,13 +33,13 @@ class TestIntegration: def test_filecheck(self, src_invalid, dst): groomer = KittenGroomerFileCheck(src_invalid, dst, debug=True) - groomer.processdir() + groomer.run() test_description = "filecheck_invalid" save_logs(groomer, test_description) def test_filecheck_2(self, src_valid, dst): groomer = KittenGroomerFileCheck(src_valid, dst, debug=True) - groomer.processdir() + groomer.run() test_description = "filecheck_valid" save_logs(groomer, test_description)