URL: https://github.com/freeipa/freeipa/pull/1856 Author: felipevolpone Title: #1856: [Backport][ipa-4-6] Fixing TestBackupAndRestore Action: opened
PR body: """ This PR was opened automatically because PR #1844 was pushed to master and backport to ipa-4-6 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1856/head:pr1856 git checkout pr1856
From cbe0822c8933f9f2b6a3ac6c518d8915139cd73d Mon Sep 17 00:00:00 2001 From: Felipe Barreto <fbarr...@redhat.com> Date: Wed, 18 Apr 2018 16:00:32 -0300 Subject: [PATCH 1/2] Adding GSSPROXY_CONF to be backed up on ipa-backup Without GSSPROXY_CONF being backed up, we would get this error "ipa: ERROR: No valid Negotiate header in server response" when running any ipa command after a backup restore. This commit also fixes the tests: - TestBackupAndRestore::test_full_backup_and_restore - TesttBackupAndRestore::test_full_backup_and_restore_with_selinux_booleans_off https://pagure.io/freeipa/issue/7473 --- ipaserver/install/ipa_backup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py index 475d846e6e..b0c1059acd 100644 --- a/ipaserver/install/ipa_backup.py +++ b/ipaserver/install/ipa_backup.py @@ -190,6 +190,7 @@ class Backup(admintool.AdminTool): paths.IPA_DNSKEYSYNCD_KEYTAB, paths.IPA_CUSTODIA_KEYS, paths.IPA_CUSTODIA_CONF, + paths.GSSPROXY_CONF, paths.HOSTS, ) + tuple( os.path.join(paths.IPA_NSSDB_DIR, file) From 0cd754664a8652f4164e1edf1ab8be70bd5fc303 Mon Sep 17 00:00:00 2001 From: Felipe Barreto <fbarr...@redhat.com> Date: Mon, 23 Apr 2018 08:28:30 -0300 Subject: [PATCH 2/2] Fixing TestBackupAndRestore::test_full_backup_and_restore_with_removed_users The test as it was, was testing the backup and restore based on previous backups and restore, not with an actual installation. Now, with a clear setup for each test, the test mentioned above will not fail to do a lookup (using the host command, in check_dns method) for the master domain. --- ipatests/test_integration/test_backup_and_restore.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ipatests/test_integration/test_backup_and_restore.py b/ipatests/test_integration/test_backup_and_restore.py index 266c36e3fd..089847bbb7 100644 --- a/ipatests/test_integration/test_backup_and_restore.py +++ b/ipatests/test_integration/test_backup_and_restore.py @@ -164,6 +164,8 @@ def test_full_backup_and_restore(self): def test_full_backup_and_restore_with_removed_users(self): """regression test for https://fedorahosted.org/freeipa/ticket/3866"""; + tasks.uninstall_master(self.master) + tasks.install_master(self.master) with restore_checker(self.master): backup_path = backup(self.master) @@ -187,6 +189,8 @@ def test_full_backup_and_restore_with_removed_users(self): def test_full_backup_and_restore_with_selinux_booleans_off(self): """regression test for https://fedorahosted.org/freeipa/ticket/4157"""; + tasks.uninstall_master(self.master) + tasks.install_master(self.master) with restore_checker(self.master): backup_path = backup(self.master)
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
