diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2016-06-08 18:31:48 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-17 18:55:19 +0200 |
| commit | 081941a5b9c9ac8832c465b857032e474bb9b09f (patch) | |
| tree | af57032b03c0c770c74ee6a75036b20a27e1d47a /ipatests/test_integration/test_caless.py | |
| parent | a6eb87bd68295e15ea19f5cb274cffbef5954d04 (diff) | |
| download | freeipa-081941a5b9c9ac8832c465b857032e474bb9b09f.tar.gz freeipa-081941a5b9c9ac8832c465b857032e474bb9b09f.tar.xz freeipa-081941a5b9c9ac8832c465b857032e474bb9b09f.zip | |
CI test suite for `server-del`
these tests cover various scenarios such as:
* trying to remove master that would disconnect topology in one of the
suffixes
* forcing master removal regardless of topology state before/after removal
* trying to remove last CA/DNS server/DNSSec key master
* forcing removal of the last DNSSec key master
https://fedorahosted.org/freeipa/ticket/5588
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipatests/test_integration/test_caless.py')
| -rw-r--r-- | ipatests/test_integration/test_caless.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index fdc4fc8ef..667e2b3b1 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -35,6 +35,8 @@ from ipatests.test_integration import tasks _DEFAULT = object() +assert_error = tasks.assert_error + def get_install_stdin(cert_passwords=()): lines = [ @@ -56,15 +58,6 @@ def get_replica_prepare_stdin(cert_passwords=()): return '\n'.join(lines + ['']) -def assert_error(result, stderr_text, returncode=None): - "Assert that `result` command failed and its stderr contains `stderr_text`" - assert stderr_text in result.stderr_text, result.stderr_text - if returncode: - assert result.returncode == returncode - else: - assert result.returncode > 0 - - class CALessBase(IntegrationTest): @classmethod def install(cls, mh): |