URL: https://github.com/freeipa/freeipa/pull/4935
Author: fcami
 Title: #4935: ipatests: xfail TestIpaClientAutomountFileRestore's final test
Action: opened

PR body:
"""
Due to a change in authselect, rolling back the installation
does not produce the same nsswitch.conf as on a clean install.
Mark the test xfail until ipa-client-install is enhanced to
use authselect profile backup/restore.

Related: https://pagure.io/freeipa/issue/8189
Signed-off-by: François Cami <fc...@redhat.com>
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/4935/head:pr4935
git checkout pr4935
From ac6c4564cb7feea30af571a38890f98ef68d4f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fc...@redhat.com>
Date: Mon, 20 Jul 2020 16:59:35 +0200
Subject: [PATCH 1/2] ipatests: xfail TestIpaClientAutomountFileRestore's final
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Due to a change in authselect, rolling back the installation
does not produce the same nsswitch.conf as on a clean install.
Mark the test xfail until ipa-client-install is enhanced to
use authselect profile backup/restore.

Related: https://pagure.io/freeipa/issue/8189
Signed-off-by: François Cami <fc...@redhat.com>
---
 ipatests/test_integration/test_nfs.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/ipatests/test_integration/test_nfs.py b/ipatests/test_integration/test_nfs.py
index 8c622de2b6..d18d8a78e4 100644
--- a/ipatests/test_integration/test_nfs.py
+++ b/ipatests/test_integration/test_nfs.py
@@ -295,12 +295,12 @@ def nsswitch_backup_restore(
 
         # In order to get a more pure sum, one that ignores the Generated
         # header and any whitespace we have to do a bit of work...
-        sha256nsswitch_cmd = \
+        self.sha256nsswitch_cmd = \
             'egrep -v "Generated|^$" /etc/nsswitch.conf | sed "s/\\s//g" ' \
             '| sort | sha256sum'
 
-        cmd = self.clients[0].run_command(sha256nsswitch_cmd)
-        orig_sha256 = cmd.stdout_text
+        cmd = self.clients[0].run_command(self.sha256nsswitch_cmd)
+        self.orig_sha256 = cmd.stdout_text
 
         grep_automount_command = \
             "grep automount /etc/nsswitch.conf | cut -d: -f2"
@@ -349,12 +349,19 @@ def nsswitch_backup_restore(
         cmd = self.clients[0].run_command(grep_automount_command)
         assert cmd.stdout_text.split() == after_ipa_client_install
 
+    @pytest.mark.xfail(
+        strict=True,
+        reason="https://pagure.io/freeipa/issue/8189";
+    )
+    def verify_checksum_after_ipaclient_uninstall(self):
         tasks.uninstall_client(self.clients[0])
-        cmd = self.clients[0].run_command(sha256nsswitch_cmd)
-        assert cmd.stdout_text == orig_sha256
+        cmd = self.clients[0].run_command(self.sha256nsswitch_cmd)
+        assert cmd.stdout_text == self.orig_sha256
 
     def test_nsswitch_backup_restore_sssd(self):
         self.nsswitch_backup_restore()
+        self.verify_checksum_after_ipaclient_uninstall()
 
     def test_nsswitch_backup_restore_no_sssd(self):
         self.nsswitch_backup_restore(no_sssd=True)
+        self.verify_checksum_after_ipaclient_uninstall()

From 57586e8a91dd65a38c970c821f0d17c1bf04a009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fc...@redhat.com>
Date: Tue, 21 Jul 2020 09:30:23 +0200
Subject: [PATCH 2/2] temp commit

---
 ipatests/prci_definitions/temp_commit.yaml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/ipatests/prci_definitions/temp_commit.yaml b/ipatests/prci_definitions/temp_commit.yaml
index e337068145..8b40b6651f 100644
--- a/ipatests/prci_definitions/temp_commit.yaml
+++ b/ipatests/prci_definitions/temp_commit.yaml
@@ -61,14 +61,27 @@ jobs:
         timeout: 1800
         topology: *build
 
-  fedora-latest/temp_commit:
+  fedora-latest/nfs:
     requires: [fedora-latest/build]
     priority: 50
     job:
       class: RunPytest
       args:
         build_url: '{fedora-latest/build_url}'
-        test_suite: test_integration/test_REPLACEME.py
+        test_suite: test_integration/test_nfs.py::TestNFS
+        template: *ci-master-latest
+        timeout: 9000
+        topology: *master_3client
+
+  fedora-latest/nfs_nsswitch_restore:
+    requires: [fedora-latest/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-latest/build_url}'
+        test_suite: test_integration/test_nfs.py::TestIpaClientAutomountFileRestore
         template: *ci-master-latest
         timeout: 3600
-        topology: *master_1repl_1client
+        topology: *master_3client
+
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org

Reply via email to