From 810765ddc9de9cc79e40a12a4bda74d808cafca3 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Thu, 6 Aug 2015 16:58:25 -0700 Subject: [PATCH] MacOS: fix path quirk in filemanager unit tests. On MacOS, `tempfile.mkdtemp()` doesn't necessarily return a canonical path (it uses `/private/var` instead of `/var`, but they are the same thing). Since the `filemanager.storage` module canonicalizes paths, tests were erroneously failing due to prefix match failures. --- tests/filemanager/test_localstorage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/filemanager/test_localstorage.py b/tests/filemanager/test_localstorage.py index 87bc9b9c..45666a01 100644 --- a/tests/filemanager/test_localstorage.py +++ b/tests/filemanager/test_localstorage.py @@ -8,6 +8,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import unittest import os import mock +import os.path from ddt import ddt, unpack, data @@ -41,7 +42,7 @@ class LocalStorageTest(unittest.TestCase): def setUp(self): import tempfile - self.basefolder = tempfile.mkdtemp() + self.basefolder = os.path.realpath(os.path.abspath(tempfile.mkdtemp())) self.storage = octoprint.filemanager.storage.LocalFileStorage(self.basefolder) # mock file manager module