summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorOleg Fayans <ofayans@redhat.com>2016-09-21 13:24:20 +0200
committerDavid Kupka <dkupka@redhat.com>2016-09-22 15:20:42 +0200
commit9870c5804a65ae320ebbcb313f8facb21963f710 (patch)
tree8e439a3e49c549530cc4d5036544397135647b96 /ipatests
parent7412f0cb20801e1608f8cf388210e57ef7d27497 (diff)
tests: Reverted erroneous asserts in 4 tests
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_integration/test_caless.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
index a504ce707..35bfdbe85 100644
--- a/ipatests/test_integration/test_caless.py
+++ b/ipatests/test_integration/test_caless.py
@@ -1368,19 +1368,13 @@ class TestCertinstall(CALessBase):
"Install new HTTP certificate issued by intermediate CA"
result = self.certinstall('w', 'ca1/subca/server')
- assert_error(result,
- 'server.p12 is not signed by /etc/ipa/ca.crt, or the '
- 'full certificate chain is not present in the PKCS#12 '
- 'file')
+ assert result.returncode == 0, result.stderr_text
def test_ds_intermediate_ca(self):
"Install new DS certificate issued by intermediate CA"
result = self.certinstall('d', 'ca1/subca/server')
- assert_error(result,
- 'server.p12 is not signed by /etc/ipa/ca.crt, or the '
- 'full certificate chain is not present in the PKCS#12 '
- 'file')
+ assert result.returncode == 0, result.stderr_text
def test_self_signed(self):
"Install new self-signed certificate"
@@ -1464,7 +1458,7 @@ class TestCertinstall(CALessBase):
'--http-pin', self.cert_password]
result = self.certinstall('w', 'ca1/server', args=args)
- assert result.returncode == 0
+ assert_error(result, "no such option: --http-pin")
def test_ds_old_options(self):
"Install new valid DS certificate using pre-v3.3 CLI options"
@@ -1477,4 +1471,4 @@ class TestCertinstall(CALessBase):
result = self.certinstall('d', 'ca1/server',
args=args, stdin_text=stdin_text)
- assert result.returncode == 0
+ assert_error(result, "no such option: --dirsrv-pin")