Update tests for new logger

pull/14/head
Dan Puttick 2017-04-10 13:18:51 +02:00
parent c43ac0697a
commit 3e56787686
1 changed files with 23 additions and 31 deletions

View File

@ -13,44 +13,26 @@ try:
except ImportError: except ImportError:
NODEPS = True NODEPS = True
fixture = pytest.fixture
skip = pytest.mark.skip
skipif_nodeps = pytest.mark.skipif(NODEPS, skipif_nodeps = pytest.mark.skipif(NODEPS,
reason="Dependencies aren't installed") reason="Dependencies aren't installed")
@skipif_nodeps @skipif_nodeps
class TestIntegration: class TestSystem:
@pytest.fixture @fixture
def src_valid_path(self): def valid_groomer(self):
return os.path.join(os.getcwd(), 'tests/src_valid') src_path = os.path.join(os.getcwd(), 'tests/src_valid')
dst_path = self.make_dst_dir_path(src_path)
return KittenGroomerFileCheck(src_path, dst_path, debug=True)
@pytest.fixture @fixture
def src_invalid_path(self): def invalid_groomer(self):
return os.path.join(os.getcwd(), 'tests/src_invalid') src_path = os.path.join(os.getcwd(), 'tests/src_invalid')
dst_path = self.make_dst_dir_path(src_path)
@pytest.fixture return KittenGroomerFileCheck(src_path, dst_path, debug=True)
def dst(self):
return os.path.join(os.getcwd(), 'tests/dst')
def test_filecheck_src_invalid(self, src_invalid_path):
dst_path = self.make_dst_dir_path(src_invalid_path)
groomer = KittenGroomerFileCheck(src_invalid_path, dst_path, debug=True)
groomer.run()
test_description = "filecheck_invalid"
save_logs(groomer, test_description)
def test_filecheck_2(self, src_valid_path):
dst_path = self.make_dst_dir_path(src_valid_path)
groomer = KittenGroomerFileCheck(src_valid_path, dst_path, debug=True)
groomer.run()
test_description = "filecheck_valid"
save_logs(groomer, test_description)
def test_processdir(self):
pass
def test_handle_archives(self):
pass
def make_dst_dir_path(self, src_dir_path): def make_dst_dir_path(self, src_dir_path):
dst_path = src_dir_path + '_dst' dst_path = src_dir_path + '_dst'
@ -58,6 +40,16 @@ class TestIntegration:
os.makedirs(dst_path, exist_ok=True) os.makedirs(dst_path, exist_ok=True)
return dst_path return dst_path
def test_filecheck_src_valid(self, valid_groomer):
valid_groomer.run()
test_description = "filecheck_valid"
save_logs(valid_groomer, test_description)
def test_filecheck_src_invalid(self, invalid_groomer):
invalid_groomer.run()
test_description = "filecheck_invalid"
save_logs(invalid_groomer, test_description)
class TestFileHandling: class TestFileHandling:
def test_autorun(self): def test_autorun(self):