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

Add support for a dir of client tests

Browse Source
This commit is contained in:
Thomas S Hatch 2012-04-03 21:14:09 -06:00
parent 77d1213781
commit 6c0c05c523
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/runtests.py
View File

@ -12,9 +12,12 @@ TEST_DIR = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
def run_integration_tests(): def run_integration_tests():
with TestDaemon(): with TestDaemon():
loader = saltunittest.TestLoader() moduleloader = saltunittest.TestLoader()
tests = loader.discover(os.path.join(TEST_DIR, 'integration', 'modules'), '*.py') moduletests = moduleloader.discover(os.path.join(TEST_DIR, 'integration', 'modules'), '*.py')
saltunittest.TextTestRunner(verbosity=1).run(tests) saltunittest.TextTestRunner(verbosity=1).run(moduletests)
clientloader = saltunittest.TestLoader()
clienttests = clientloader.discover(os.path.join(TEST_DIR, 'integration', 'client'), '*.py')
saltunittest.TextTestRunner(verbosity=1).run(clienttests)
def run_unit_tests(): def run_unit_tests():
loader = saltunittest.TestLoader() loader = saltunittest.TestLoader()