From 303d52e4acdc33dea6e3e89ffd2213cbbc8a4505 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Thu, 14 Nov 2019 14:32:52 -0800 Subject: [PATCH] tests: fix mkdirs permissions test to cleanup after failure --- tests/func/test_utils.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/func/test_utils.py b/tests/func/test_utils.py index 3ea25eed5..c764a80e4 100644 --- a/tests/func/test_utils.py +++ b/tests/func/test_utils.py @@ -1,3 +1,4 @@ +# encoding: utf-8 import filecmp import os import shutil @@ -77,11 +78,14 @@ class TestUtils(TestDvc): @pytest.mark.skipif(os.name == "nt", reason="Not supported for Windows.") def test_makedirs_permissions(): dir_mode = 0o755 - intermediate_dir = "testdir" + intermediate_dir = "тестовая-директория" test_dir = os.path.join(intermediate_dir, "data") - utils.makedirs(test_dir, mode=dir_mode) - assert stat.S_IMODE(os.stat(test_dir).st_mode) == dir_mode - assert stat.S_IMODE(os.stat(intermediate_dir).st_mode) == dir_mode + assert not os.path.exists(intermediate_dir) - shutil.rmtree(test_dir) + try: + utils.makedirs(test_dir, mode=dir_mode) + assert stat.S_IMODE(os.stat(test_dir).st_mode) == dir_mode + assert stat.S_IMODE(os.stat(intermediate_dir).st_mode) == dir_mode + finally: + shutil.rmtree(intermediate_dir)