saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #56740 from s0undt3ch/hotfix/pytest-patch-8

Browse source 
[PyTest #33 - Extract] Don't fail on windows
This commit is contained in:
Daniel Wozniak 2020-04-22 09:40:10 -07:00 • committed by GitHub
commit eb30b1c59b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/unit/returners/test_local_cache.py
View file

@ -6,7 +6,6 @@ tests.unit.returners.local_cache_test
Unit tests for the Default Job Cache (local_cache).
"""
# Import Python libs
from __future__ import absolute_import, print_function, unicode_literals
import logging
@ -16,15 +15,11 @@ import tempfile
import time
import salt.returners.local_cache as local_cache
# Import Salt libs
import salt.utils.files
import salt.utils.jid
import salt.utils.job
import salt.utils.platform
from salt.ext import six
# Import Salt Testing libs
from tests.support.mixins import (
AdaptedConfigurationTestCaseMixin,
LoaderModuleMockMixin,
@ -43,7 +38,9 @@ class LocalCacheCleanOldJobsTestCase(TestCase, LoaderModuleMockMixin):
@classmethod
def setUpClass(cls):
cls.TMP_CACHE_DIR = os.path.join(RUNTIME_VARS.TMP, "salt_test_job_cache")
cls.TMP_CACHE_DIR = tempfile.mkdtemp(
prefix="salt_test_job_cache", dir=RUNTIME_VARS.TMP
)
cls.TMP_JID_DIR = os.path.join(cls.TMP_CACHE_DIR, "jobs")
def setup_loader_modules(self):
@ -59,7 +56,7 @@ class LocalCacheCleanOldJobsTestCase(TestCase, LoaderModuleMockMixin):
_make_tmp_jid_dirs replaces it.
"""
if os.path.exists(self.TMP_CACHE_DIR):
shutil.rmtree(self.TMP_CACHE_DIR)
shutil.rmtree(self.TMP_CACHE_DIR, ignore_errors=True)
def test_clean_old_jobs_no_jid_root(self):
"""
@ -229,7 +226,9 @@ class Local_CacheTest(
@classmethod
def setUpClass(cls):
cls.TMP_CACHE_DIR = os.path.join(RUNTIME_VARS.TMP, "rootdir", "cache")
cls.TMP_CACHE_DIR = tempfile.mkdtemp(
prefix="salt_test_local_cache", dir=RUNTIME_VARS.TMP
)
cls.JOBS_DIR = os.path.join(cls.TMP_CACHE_DIR, "jobs")
cls.JID_DIR = os.path.join(
cls.JOBS_DIR,
@ -258,7 +257,7 @@ class Local_CacheTest(
attr_instance = getattr(cls, attrname)
if isinstance(attr_instance, six.string_types):
if os.path.isdir(attr_instance):
shutil.rmtree(attr_instance)
shutil.rmtree(attr_instance, ignore_errors=True)
elif os.path.isfile(attr_instance):
os.unlink(attr_instance)
delattr(cls, attrname)