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 tcp transport to jenkins and runtests

Browse source
This commit is contained in:
Justin Findlay 2015-07-20 16:56:00 -06:00
parent 3083c71ec3
commit 5dadaec775
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/jenkins.py
View file

@ -828,8 +828,10 @@ def parse():
parser.add_option(
'--test-transport',
default='zeromq',
choices=('zeromq', 'raet'),
help='Set to raet to run integration tests with raet transport. Default: %default')
choices=('zeromq', 'raet', 'tcp'),
help=('Select which transport to run the integration tests with, '
'zeromq, raet, or tcp. Default: %default')
)
parser.add_option(
'--test-without-coverage',
default=False,

6
tests/runtests.py
View file

@ -55,8 +55,10 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
self.add_option(
'--transport',
default='zeromq',
choices=('zeromq', 'raet'),
help='Set to raet to run integration tests with raet transport. Default: %default')
choices=('zeromq', 'raet', 'tcp'),
help=('Select which transport to run the integration tests with, '
'zeromq, raet, or tcp. Default: %default')
)
self.add_option(
'--interactive',
default=False,