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

Fix integration.shell.test_key and integration.shell.test_runner

Browse source
This commit is contained in:
Alexey Aksenov 2018-06-18 11:32:02 +03:00
parent 26a6f79730
commit 9ed2d2ec55
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/shell/test_key.py
View file

@ -232,10 +232,8 @@ class KeyTest(ShellCase, ShellCaseCommonTestsMixin):
test salt-key -l with wrong eauth
'''
data = self.run_key('-l acc --eauth wrongeauth --username {0} --password {1}'.format(USERA, USERA_PWD))
expect = ['The specified external authentication system "wrongeauth" is not available',
'Available eauth types: auto, django, file, keystone, ldap, mysql, pam, ',
'pki, rest, sharedsecret, yubico']
self.assertEqual(data, expect)
expect = r"^The specified external authentication system \"wrongeauth\" is not available\tAvailable eauth types: auto, .*"
self.assertRegex("\t".join(data), expect)
def test_list_un(self):
'''

6
tests/integration/shell/test_runner.py
View file

@ -208,7 +208,5 @@ class RunTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin)
'''
run_cmd = self.run_run('-a wrongeauth --username {0} --password {1}\
test.arg arg kwarg=kwarg1'.format(USERA, USERA_PWD))
expect = ['The specified external authentication system "wrongeauth" is not available',
'Available eauth types: auto, django, file, keystone, ldap, mysql, pam, ',
'pki, rest, sharedsecret, yubico']
self.assertEqual(expect, run_cmd)
expect = r"^The specified external authentication system \"wrongeauth\" is not available\tAvailable eauth types: auto, .*"
self.assertRegex("\t".join(run_cmd), expect)