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

modules.mac_brew int tests: move decorators to class

Browse Source 
Also remove unneeded system grains code.
This commit is contained in:
Justin Findlay 2016-05-25 18:23:49 -06:00
parent fa3ec8a2bf
commit be381e0fc9
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/integration/modules/mac_brew.py
View File

@ -12,7 +12,6 @@ from salttesting import skipIf
from salttesting.helpers import (
destructiveTest,
ensure_in_syspath,
requires_system_grains
)
ensure_in_syspath('../../')
@ -27,6 +26,8 @@ ADD_PKG = 'algol68g'
DEL_PKG = 'acme'
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
class BrewModuleTest(integration.ModuleCase):
'''
Integration tests for the brew module
@ -51,10 +52,7 @@ class BrewModuleTest(integration.ModuleCase):
'You must have brew installed to run these tests'
)
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
@requires_system_grains
def test_brew_install(self, grains=None):
def test_brew_install(self):
'''
Tests the installation of packages
'''
@ -70,10 +68,7 @@ class BrewModuleTest(integration.ModuleCase):
self.run_function('pkg.remove', [ADD_PKG])
raise
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
@requires_system_grains
def test_remove(self, grains=None):
def test_remove(self):
'''
Tests the removal of packages
'''
@ -96,10 +91,7 @@ class BrewModuleTest(integration.ModuleCase):
self.run_function('pkg.remove', [DEL_PKG])
raise
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
@requires_system_grains
def test_mac_brew_pkg_version(self, grains=None):
def test_mac_brew_pkg_version(self):
'''
Test pkg.version for mac. Installs
a package and then checks we can get
@ -129,20 +121,14 @@ class BrewModuleTest(integration.ModuleCase):
self.run_function('pkg.remove', [ADD_PKG])
raise
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
@requires_system_grains
def test_mac_brew_refresh_db(self, grains=None):
def test_mac_brew_refresh_db(self):
'''
Integration test to ensure pkg.refresh_db works with brew
'''
refresh_brew = self.run_function('pkg.refresh_db')
self.assertTrue(refresh_brew)
@destructiveTest
@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
@requires_system_grains
def tearDown(self, grains=None):
def tearDown(self):
'''
Clean up after tests
'''