valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35647 from cachedout/remove_more_decorators

Browse Source 
Switch to using skipIf instead of a custom decorator
This commit is contained in:
Mike Place 2016-08-22 16:37:39 +09:00 committed by GitHub
commit 14612e9a9a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/integration/modules/mac_system.py
View File

@ -9,6 +9,7 @@ import random
import string
# Import Salt Testing libs
from salttesting import skipIf
from salttesting.helpers import ensure_in_syspath, destructiveTest
from salt.ext.six.moves import range
ensure_in_syspath('../../')
@ -18,12 +19,6 @@ import integration
import salt.utils
def disabled(f):
def _decorator(f):
print('{0} has been disabled'.format(f.__name__))
return _decorator(f)
def __random_string(size=6):
'''
Generates a random username
@ -38,6 +33,9 @@ SET_COMPUTER_NAME = __random_string()
SET_SUBNET_NAME = __random_string()
@skipIf(not salt.utils.is_darwin()
or not salt.utils.which('systemsetup')
or salt.utils.get_uid(salt.utils.get_user() != 0), 'Test requirements not met')
class MacSystemModuleTest(integration.ModuleCase):
'''
Validate the mac_system module
@ -53,15 +51,6 @@ class MacSystemModuleTest(integration.ModuleCase):
'''
Get current settings
'''
if not salt.utils.is_darwin():
self.skipTest('Test only available on Mac OS X')
if not salt.utils.which('systemsetup'):
self.skipTest('Test requires systemsetup binary')
if salt.utils.get_uid(salt.utils.get_user()) != 0:
self.skipTest('Test requires root')
self.ATRUN_ENABLED = self.run_function('service.enabled', ['com.apple.atrun'])
self.REMOTE_LOGIN_ENABLED = self.run_function('system.get_remote_login')
self.REMOTE_EVENTS_ENABLED = self.run_function('system.get_remote_events')
@ -179,7 +168,6 @@ class MacSystemModuleTest(integration.ModuleCase):
'Invalid value passed for path.',
self.run_function('system.set_startup_disk', ['spongebob']))
@disabled
def test_get_set_restart_delay(self):
'''
Test system.get_restart_delay
@ -238,7 +226,6 @@ class MacSystemModuleTest(integration.ModuleCase):
self.run_function('system.set_disable_keyboard_on_lock',
['spongebob']))
@disabled
def test_get_set_boot_arch(self):
'''
Test system.get_boot_arch