valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pedro Algarvio 2017-02-20 15:25:06 +00:00
parent 5d0110d98b
commit 15376697f9
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/modules/test_beacons.py
View File

@ -8,18 +8,13 @@ from __future__ import absolute_import
import os
# Salt Libs
from salt.modules import beacons
from salt.exceptions import CommandExecutionError
import integration
import salt.utils
# Salttesting libs
from salttesting import skipIf
from salttesting.helpers import destructiveTest, ensure_in_syspath
ensure_in_syspath('../../')
beacons.__opts__ = {}
BEACON_CONF_DIR = os.path.join(integration.TMP, 'minion.d')
if not os.path.exists(BEACON_CONF_DIR):
@ -37,8 +32,6 @@ else:
IS_ADMIN = os.geteuid() == 0
@skipIf(not IS_ADMIN, 'You must be root to run these tests')
@destructiveTest
class BeaconsAddDeleteTest(integration.ModuleCase):
'''
Tests the add and delete functions
@ -62,8 +55,6 @@ class BeaconsAddDeleteTest(integration.ModuleCase):
self.run_function('beacons.save')
@skipIf(not IS_ADMIN, 'You must be root to run these tests')
@destructiveTest
class BeaconsTest(integration.ModuleCase):
'''
Tests the beacons execution module
@ -143,8 +134,3 @@ class BeaconsTest(integration.ModuleCase):
self.assertEqual(ret, {'ps': {'apache2': 'stopped'}, 'enabled': True})
else:
self.assertEqual(ret, {'ps': {'apache': 'stopped'}})
if __name__ == '__main__':
from integration import run_tests
run_tests([BeaconsAddDeleteTest, BeaconsTest])