diff --git a/unittests/test_caosdbignore.py b/unittests/test_caosdbignore.py index c044a8e8c53d7caa9bd0eb934e22801ea0d3bde2..39839db4b8787a2a70a507d09d132ff66a6e2d97 100644 --- a/unittests/test_caosdbignore.py +++ b/unittests/test_caosdbignore.py @@ -44,7 +44,7 @@ class Linkaheadignore(unittest.TestCase): assert len(files) == 3 assert os.path.join(BASEDIR, "data", "datatypes.xlsx") in files assert os.path.join(BASEDIR, "data", "README.xlsx") in files - assert os.path.join(BASEDIR, "data", "Publications/Posters/2019-02-03_something/README.md") in files + assert os.path.join(BASEDIR, "data", "Publications", "Posters", "2019-02-03_something", "README.md") in files def test_regex(self): files = [r"/dies/ist/simple", r"/dies/eh(er)/nich?t"] diff --git a/unittests/test_suppressKnown.py b/unittests/test_suppressKnown.py index 6f87e8429638c9035fcb805b3b29ebb72d86caff..d148a5a3840d0d6224696ecdd62dda6a5d41b7ba 100644 --- a/unittests/test_suppressKnown.py +++ b/unittests/test_suppressKnown.py @@ -25,7 +25,7 @@ import logging import os import unittest -from tempfile import NamedTemporaryFile +from tempfile import NamedTemporaryFile, gettempdir from caosadvancedtools.suppressKnown import SuppressKnown @@ -40,7 +40,7 @@ class Record(object): class SupTestBasic(unittest.TestCase): def setUp(self): - self.db_file = "/tmp/test_suppress_msg_db_file.db" + self.db_file = os.path.join(gettempdir(), "test_suppress_msg_db_file_basic.db") self.basic = SuppressKnown(db_file=self.db_file) def test_msg(self): @@ -52,12 +52,12 @@ class SupTestBasic(unittest.TestCase): self.basic.filter(r) def tearDown(self): - os.remove(self.db_file) + pass class SupTestAdvanced(SupTestBasic): def setUp(self): - self.db_file = "/tmp/test_suppress_msg_db_file.db" + self.db_file = os.path.join(gettempdir(), "test_suppress_msg_db_file_advanced.db") self.basic = SuppressKnown(db_file=self.db_file) def test_logger(self): @@ -65,13 +65,12 @@ class SupTestAdvanced(SupTestBasic): The logging output is directed to a file which is then checked whether the output is as expected. """ - logfile = NamedTemporaryFile() + logfile = NamedTemporaryFile(delete=False, mode="w") logger = logging.getLogger() logger.addHandler(logging.FileHandler(logfile.name)) logger.setLevel(logging.DEBUG) sup = SuppressKnown(db_file=self.db_file) logger.addFilter(sup) - logger.info("hi", extra={"identifier": "5", 'category': "test"}) with open(logfile.name) as lf: log = lf.read() diff --git a/unittests/test_utils.py b/unittests/test_utils.py index 09688f97a6ce73ba1a8f4463f01853a358e5b1dc..c8134e3d30ed2f19a4784890703381d244078e25 100644 --- a/unittests/test_utils.py +++ b/unittests/test_utils.py @@ -23,7 +23,7 @@ import logging import unittest from tempfile import NamedTemporaryFile - +import os import linkahead as db from caosadvancedtools.utils import (check_win_path, get_referenced_files, string_to_person, create_entity_link) @@ -47,7 +47,7 @@ class BaseMockUpTest(unittest.TestCase): connection._delegate_connection.resources.append( lambda **kwargs: MockUpResponse(200, {}, self.entities)) - self.logfile = NamedTemporaryFile() + self.logfile = NamedTemporaryFile(delete=False) logger = logging.getLogger() logger.addHandler(logging.FileHandler(self.logfile.name)) logger.setLevel(logging.DEBUG) @@ -77,7 +77,7 @@ class ReferencesBaseTest(BaseMockUpTest): files = get_referenced_files("test.npy", prefix=None, filename=None, location=None) self.assertEqual(len(files), 1) - self.assertEqual(files[0].path, "/some/path/test.npy") + self.assertEqual(os.path.join(files[0].path, "some", "path", "test.npy")) log = self.get_log() assert "FIND file which" in log assert "does not allow a search" not in log