mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip daemon unit tests when running on Python 2.6 (#38134)
When switching the daemon unit tests to using multiprocessing pipes, this exposed a deep bug in Python 2.6. Let's skip these on 2.6.
This commit is contained in:
parent
d3d98fd4eb
commit
86091db647
1 changed files with 6 additions and 0 deletions
|
@ -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):
|
||||
'''
|
||||
|
@ -61,6 +66,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.
|
||||
|
|
Loading…
Add table
Reference in a new issue