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

No globals in tests, specially dictionaries!

Browse source
This commit is contained in:
Pedro Algarvio 2019-04-30 17:58:24 +01:00
parent a814fc071d
commit 087c74d907
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/unit/utils/test_schedule.py
View file

@ -29,17 +29,6 @@ except ImportError:
log = logging.getLogger(__name__)
ROOT_DIR = os.path.join(integration.TMP, 'schedule-unit-tests')
SOCK_DIR = os.path.join(ROOT_DIR, 'test-socks')
DEFAULT_CONFIG = salt.config.minion_config(None)
DEFAULT_CONFIG['conf_dir'] = ROOT_DIR
DEFAULT_CONFIG['root_dir'] = ROOT_DIR
DEFAULT_CONFIG['sock_dir'] = SOCK_DIR
DEFAULT_CONFIG['pki_dir'] = os.path.join(ROOT_DIR, 'pki')
DEFAULT_CONFIG['cachedir'] = os.path.join(ROOT_DIR, 'cache')
# pylint: disable=too-many-public-methods,invalid-name
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ScheduleTestCase(TestCase):
@ -47,9 +36,24 @@ class ScheduleTestCase(TestCase):
Unit tests for salt.utils.schedule module
'''
@classmethod
def setUpClass(cls):
root_dir = os.path.join(integration.TMP, 'schedule-unit-tests')
default_config = salt.config.minion_config(None)
default_config['conf_dir'] = default_config['root_dir'] = root_dir
default_config['sock_dir'] = os.path.join(root_dir, 'test-socks')
default_config['pki_dir'] = os.path.join(root_dir, 'pki')
default_config['cachedir'] = os.path.join(root_dir, 'cache')
cls.default_config = default_config
@classmethod
def tearDownClass(cls):
delattr(cls, 'default_config')
def setUp(self):
with patch('salt.utils.schedule.clean_proc_dir', MagicMock(return_value=None)):
self.schedule = Schedule(copy.deepcopy(DEFAULT_CONFIG), {}, returners={})
self.schedule = Schedule(copy.deepcopy(self.default_config), {}, returners={})
self.addCleanup(delattr, self, 'schedule')
# delete_job tests