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

tests: fixed expects of incorrect error messages

Browse Source 
Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Oleg Fayans 2016-09-21 14:12:10 +02:00 committed by David Kupka
parent b8cf212e8b
commit 804aae8196
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ipatests/test_integration/test_caless.py
View File

@ -353,9 +353,7 @@ class TestServerInstall(CALessBase):
result = self.install_server() result = self.install_server()
assert_error(result, assert_error(result,
'server.p12 is not signed by root.pem, or the full ' 'The full certificate chain is not present in server.p12')
'certificate chain is not present in the PKCS#12 '
'file')
@server_install_teardown @server_install_teardown
def test_ca_server_cert(self): def test_ca_server_cert(self):
@ -367,8 +365,7 @@ class TestServerInstall(CALessBase):
result = self.install_server() result = self.install_server()
assert_error(result, assert_error(result,
'trust chain of the server certificate in server.p12 ' 'The full certificate chain is not present in server.p12')
'contains 1 certificates, expected 2')
@pytest.mark.xfail(reason='Ticket N 6289') @pytest.mark.xfail(reason='Ticket N 6289')
@server_install_teardown @server_install_teardown
@ -598,9 +595,9 @@ class TestServerInstall(CALessBase):
result = self.install_server(http_pkcs12='http.p12', result = self.install_server(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result, 'Apache Server SSL certificate and'
'http.p12 is not signed by root.pem, or the full ' ' Directory Server SSL certificate are not'
'certificate chain is not present in the PKCS#12 file') ' signed by the same CA certificate')
@server_install_teardown @server_install_teardown
def test_ds_intermediate_ca(self): def test_ds_intermediate_ca(self):
@ -614,8 +611,8 @@ class TestServerInstall(CALessBase):
result = self.install_server(http_pkcs12='http.p12', result = self.install_server(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result,
'dirsrv.p12 is not signed by root.pem, or the full ' 'Apache Server SSL certificate and Directory Server SSL'
'certificate chain is not present in the PKCS#12 file') ' certificate are not signed by the same CA certificate')
@server_install_teardown @server_install_teardown
def test_ca_self_signed(self): def test_ca_self_signed(self):
@ -712,7 +709,7 @@ class TestServerInstall(CALessBase):
stdin_text=stdin_text) stdin_text=stdin_text)
assert result.returncode == 0 assert result.returncode == 0
self.verify_installation() self.verify_installation()
assert ('Enter server.p12 unlock password:' assert ('Enter Apache Server private key unlock password'
in result.stdout_text), result.stdout_text in result.stdout_text), result.stdout_text
@server_install_teardown @server_install_teardown
@ -729,7 +726,7 @@ class TestServerInstall(CALessBase):
stdin_text=stdin_text) stdin_text=stdin_text)
assert result.returncode == 0 assert result.returncode == 0
self.verify_installation() self.verify_installation()
assert ('Enter server.p12 unlock password:' assert ('Enter Directory Server private key unlock password'
in result.stdout_text), result.stdout_text in result.stdout_text), result.stdout_text
@server_install_teardown @server_install_teardown
@ -782,11 +779,10 @@ class TestReplicaInstall(CALessBase):
result = self.master.run_command(['ipa-replica-prepare', result = self.master.run_command(['ipa-replica-prepare',
self.replicas[0].hostname], self.replicas[0].hostname],
raiseonerr=False) raiseonerr=False)
assert result.returncode > 0 assert_error(result, "Cannot issue certificates: a CA is not "
assert ('Cannot issue certificates: a CA is not installed. Use the ' "installed. Use the --http-cert-file, "
'--http-cert-file, --dirsrv-cert-file options to provide ' "--dirsrv-cert-file options to provide "
'custom certificates.' in result.stderr_text), \ "custom certificates.")
result.stderr_text
@replica_install_teardown @replica_install_teardown
def test_nonexistent_http_pkcs12_file(self): def test_nonexistent_http_pkcs12_file(self):
@ -840,9 +836,9 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result, 'Apache Server SSL certificate and'
'http.p12 is not signed by /etc/ipa/ca.crt, or the full ' ' Directory Server SSL certificate are not'
'certificate chain is not present in the PKCS#12 file') ' signed by the same CA certificate')
@replica_install_teardown @replica_install_teardown
def test_ds_unknown_ca(self): def test_ds_unknown_ca(self):
@ -854,9 +850,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result,
'dirsrv.p12 is not signed by /etc/ipa/ca.crt, or the ' 'Apache Server SSL certificate and Directory Server SSL'
'full certificate chain is not present in the PKCS#12 ' ' certificate are not signed by the same CA certificate')
'file')
@replica_install_teardown @replica_install_teardown
def test_invalid_http_cn(self): def test_invalid_http_cn(self):
@ -982,8 +977,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result,
'http.p12 is not signed by /etc/ipa/ca.crt, or the full ' 'Apache Server SSL certificate and Directory Server SSL'
'certificate chain is not present in the PKCS#12 file') ' certificate are not signed by the same CA certificate')
@replica_install_teardown @replica_install_teardown
def test_ds_intermediate_ca(self): def test_ds_intermediate_ca(self):
@ -994,10 +989,9 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert_error(result, assert_error(result, 'Apache Server SSL certificate and'
'dirsrv.p12 is not signed by /etc/ipa/ca.crt, or the ' ' Directory Server SSL certificate are not'
'full certificate chain is not present in the PKCS#12 ' ' signed by the same CA certificate')
'file')
@replica_install_teardown @replica_install_teardown
def test_valid_certs(self): def test_valid_certs(self):
@ -1422,9 +1416,7 @@ class TestCertinstall(CALessBase):
result = self.certinstall('w', 'server-selfsign') result = self.certinstall('w', 'server-selfsign')
assert_error(result, assert_error(result,
'server.p12 is not signed by /etc/ipa/ca.crt, or the ' 'The full certificate chain is not present in server.p12')
'full certificate chain is not present in the PKCS#12 '
'file')
def test_valid_http(self): def test_valid_http(self):
"Install new valid HTTP certificate" "Install new valid HTTP certificate"