From 2adfaa3a9bd94707d9cc78f9fb6bd85d53477db2 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Mon, 20 Jan 2014 09:28:26 +0100 Subject: ipatests: Check for legacy_client attribute presence if unapplying fixes When legacy client tests fail during IPA installation, the legacy client test produces an additional misleading error (the real cause is reported as well). This happens due the fact that we try to cleanup host that was not yet defined. We need to check for this attribute being defined before unapplying fixes there. https://fedorahosted.org/freeipa/ticket/4124 --- ipatests/test_integration/test_legacy_clients.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipatests/test_integration/test_legacy_clients.py b/ipatests/test_integration/test_legacy_clients.py index 72b7ff49..6bbe54b3 100644 --- a/ipatests/test_integration/test_legacy_clients.py +++ b/ipatests/test_integration/test_legacy_clients.py @@ -233,7 +233,11 @@ class BaseTestLegacyClient(trust_tests.TestEnforcedPosixADTrust): def uninstall(cls): cls.master.run_command(['ipa', 'user-del', 'disabledipauser'], raiseonerr=False) - tasks.unapply_fixes(cls.legacy_client) + + # Also unapply fixes on the legacy client, if defined + if hasattr(cls, 'legacy_client'): + tasks.unapply_fixes(cls.legacy_client) + super(BaseTestLegacyClient, cls).uninstall() -- cgit