saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add shell tests and shellCase to test structure

Browse source
This commit is contained in:
Thomas S Hatch 2012-04-21 17:27:59 -06:00
parent 4f3fbe0991
commit e301fee420
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/__init__.py
View file

@ -5,6 +5,7 @@ Set up the Salt integration test suite
# Import Python libs
import multiprocessing
import os
import sys
import shutil
import signal
import subprocess
@ -191,7 +192,7 @@ class SyndicCase(TestCase):
orig = self.client.cmd('minion', function, arg)
return orig['minion']
class CLICase(TestCase):
class CliCase(TestCase):
'''
Execute a test for a shell command
'''
@ -210,3 +211,11 @@ class CLICase(TestCase):
stdout=subprocess.PIPE
).communicate()[0].split('\n')
return data
def run_key(self, arg_str):
'''
Execute salt-key
'''
mconf = os.path.join(INTEGRATION_TEST_DIR, 'files/conf/master')
arg_str = '-c {0} {1}'.format(mconf, arg_str)
return self.run_script('salt-key', arg_str)

21
tests/runtests.py
View file

@ -36,11 +36,24 @@ def run_integration_tests(opts=None):
saltunittest.TextTestRunner(verbosity=1).run(moduletests)
if opts.get('client', True):
clientloader = saltunittest.TestLoader()
clienttests = clientloader.discover(os.path.join(TEST_DIR, 'integration', 'client'), '*.py')
clienttests = clientloader.discover(
os.path.join(TEST_DIR, 'integration', 'client'),
'*.py'
)
print('~' * PNUM)
print('Starting Client Tests')
print('~' * PNUM)
saltunittest.TextTestRunner(verbosity=1).run(clienttests)
if opts.get('shell', True):
shellloader = saltunittest.TestLoader()
shelltests = shellloader.discover(
os.path.join(TEST_DIR, 'integration', 'shell'),
'*.py'
)
print('~' * PNUM)
print('Starting Shell Tests')
print('~' * PNUM)
saltunittest.TextTestRunner(verbosity=1).run(shelltests)
def run_unit_tests(opts=None):
@ -85,6 +98,12 @@ def parse_opts():
default=False,
action='store_true',
help='Run unit tests')
parser.add_option('-s',
'--shell',
dest='shell',
default=False,
action='store_true',
help='Run shell tests')
options, args = parser.parse_args()