IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: fix path in expected error message

Browse Source 
The test is putting server.p12 / replica.p12 in the test_dir directory,
and the error message is printing the file name with its full path.

Related to https://pagure.io/freeipa/issue/5378

Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
This commit is contained in:
Florence Blanc-Renaud
2018-10-16 14:20:49 +02:00
parent 5466eca048
commit fbcb79af13
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipatests/test_integration/test_caless.py
View File

@@ -517,7 +517,8 @@ class TestServerInstall(CALessBase):
self.prepare_cacert('ca1')
result = self.install_server(http_pin='bad<pin>')
assert_error(result, 'incorrect password for pkcs#12 file server.p12')
assert_error(result, 'incorrect password for pkcs#12 file %s' %
os.path.join(self.master.config.test_dir, 'server.p12'))
@server_install_teardown
def test_incorect_ds_pin(self):
@@ -527,7 +528,8 @@ class TestServerInstall(CALessBase):
self.prepare_cacert('ca1')
result = self.install_server(dirsrv_pin='bad<pin>')
assert_error(result, 'incorrect password for pkcs#12 file server.p12')
assert_error(result, 'incorrect password for pkcs#12 file %s' %
os.path.join(self.master.config.test_dir, 'server.p12'))
@server_install_teardown
def test_invalid_http_cn(self):
@@ -869,7 +871,9 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pin='bad<pin>')
assert result.returncode > 0
assert_error(result, 'incorrect password for pkcs#12 file replica.p12')
assert_error(result, 'incorrect password for pkcs#12 file %s' %
os.path.join(self.replicas[0].config.test_dir,
'replica.p12'))
@replica_install_teardown
def test_incorect_ds_pin(self):
@@ -878,7 +882,9 @@ class TestReplicaInstall(CALessBase):
self.create_pkcs12('ca1/replica', filename='replica.p12')
result = self.prepare_replica(dirsrv_pin='bad<pin>')
assert_error(result, 'incorrect password for pkcs#12 file replica.p12')
assert_error(result, 'incorrect password for pkcs#12 file %s' %
os.path.join(self.replicas[0].config.test_dir,
'replica.p12'))
@replica_install_teardown
def test_http_unknown_ca(self):