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 branch '2016.3' into '2016.11'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-12-07 13:14:28 -07:00
commit 28b56ea3b4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/daemons_test.py
View file

@ -5,6 +5,7 @@
# Import python libs
from __future__ import absolute_import
import sys
# Import Salt Testing libs
from salttesting import TestCase, skipIf
@ -18,6 +19,10 @@ import integration
import multiprocessing
from salt.cli import daemons
PY26 = False
if sys.version_info[1] < 7:
PY26 = True
class LoggerMock(object):
'''
@ -72,6 +77,7 @@ class LoggerMock(object):
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(PY26, 'These tests don\'t run on Python 2.6. Skipping.')
class DaemonsStarterTestCase(TestCase, integration.SaltClientTestCaseMixIn):
'''
Unit test for the daemons starter classes.