Use pytest

This commit is contained in:
Bo Maryniuk 2018-02-12 13:08:50 +01:00
parent 879c40b1c3
commit 7a0e3e983c

View File

@ -25,6 +25,11 @@ import salt.syspaths
import salt.utils.parsers
import salt.utils.platform
try:
import pytest
except ImportError:
pytest = None
class ErrorMock(object): # pylint: disable=too-few-public-methods
'''
@ -995,6 +1000,7 @@ class SaltAPIParserTestCase(LogSettingsParserTests):
self.addCleanup(delattr, self, 'parser')
@skipIf(not pytest, False)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DaemonMixInTestCase(TestCase):
'''