Imported Debian patch 4.0.5-6~numeezy

ipatests/test_integration/test_forced_client_reenrollment.py

@@ -19,7 +19,6 @@
 import os
 import subprocess
 from ipaplatform.paths import paths
-import pytest
 
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration import tasks
@@ -36,8 +35,8 @@ class TestForcedClientReenrollment(IntegrationTest):
     num_clients = 1
 
     @classmethod
-    def install(cls, mh):
-        super(TestForcedClientReenrollment, cls).install(mh)
+    def install(cls):
+        super(TestForcedClientReenrollment, cls).install()
         tasks.install_master(cls.master)
         tasks.install_replica(cls.master, cls.replicas[0], setup_ca=False)
         cls.BACKUP_KEYTAB = os.path.join(
@@ -45,7 +44,15 @@ class TestForcedClientReenrollment(IntegrationTest):
             'krb5.keytab'
         )
 
-    def test_reenroll_with_force_join(self, client):
+    def setUp(self):
+        tasks.prepare_host(self.clients[0])
+        tasks.install_client(self.master, self.clients[0])
+
+    def tearDown(self):
+        tasks.uninstall_client(self.clients[0])
+        self.delete_client_host_entry()
+
+    def test_reenroll_with_force_join(self):
         """
         Client re-enrollment using admin credentials (--force-join)
         """
@@ -56,7 +63,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         sshfp_record_post = self.get_sshfp_record()
         assert sshfp_record_pre == sshfp_record_post
 
-    def test_reenroll_with_keytab(self, client):
+    def test_reenroll_with_keytab(self):
         """
         Client re-enrollment using keytab
         """
@@ -69,7 +76,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         sshfp_record_post = self.get_sshfp_record()
         assert sshfp_record_pre == sshfp_record_post
 
-    def test_reenroll_with_both_force_join_and_keytab(self, client):
+    def test_reenroll_with_both_force_join_and_keytab(self):
         """
         Client re-enrollment using both --force-join and --keytab options
         """
@@ -82,7 +89,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         sshfp_record_post = self.get_sshfp_record()
         assert sshfp_record_pre == sshfp_record_post
 
-    def test_reenroll_to_replica(self, client):
+    def test_reenroll_to_replica(self):
         """
         Client re-enrollment using keytab, to a replica
         """
@@ -95,7 +102,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         sshfp_record_post = self.get_sshfp_record()
         assert sshfp_record_pre == sshfp_record_post
 
-    def test_try_to_reenroll_with_disabled_host(self, client):
+    def test_try_to_reenroll_with_disabled_host(self):
         """
         Client re-enrollment using keytab, with disabled host
         """
@@ -106,7 +113,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         self.restore_keytab()
         self.reenroll_client(keytab=self.BACKUP_KEYTAB, expect_fail=True)
 
-    def test_try_to_reenroll_with_uninstalled_host(self, client):
+    def test_try_to_reenroll_with_uninstalled_host(self):
         """
         Client re-enrollment using keytab, with uninstalled host
         """
@@ -117,7 +124,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         self.restore_keytab()
         self.reenroll_client(keytab=self.BACKUP_KEYTAB, expect_fail=True)
 
-    def test_try_to_reenroll_with_deleted_host(self, client):
+    def test_try_to_reenroll_with_deleted_host(self):
         """
         Client re-enrollment using keytab, with deleted host
         """
@@ -128,7 +135,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         self.restore_keytab()
         self.reenroll_client(keytab=self.BACKUP_KEYTAB, expect_fail=True)
 
-    def test_try_to_reenroll_with_incorrect_keytab(self, client):
+    def test_try_to_reenroll_with_incorrect_keytab(self):
         """
         Client re-enrollment using keytab, with incorrect keytab file
         """
@@ -198,7 +205,7 @@ class TestForcedClientReenrollment(IntegrationTest):
         assert 'IPA Server: %s' % server.hostname in result.stderr_text
 
         if expect_fail:
-            err_msg = "Kerberos authentication failed: "
+            err_msg = 'Kerberos authentication failed using keytab'
             assert result.returncode == 1
             assert err_msg in result.stderr_text
         elif force_join and keytab:
@@ -227,11 +234,10 @@ class TestForcedClientReenrollment(IntegrationTest):
             ['ipa', 'host-disable', self.clients[0].hostname]
         )
 
-    @classmethod
-    def delete_client_host_entry(cls):
+    def delete_client_host_entry(self):
         try:
-            cls.master.run_command(
-                ['ipa', 'host-del', cls.clients[0].hostname]
+            self.master.run_command(
+                ['ipa', 'host-del', self.clients[0].hostname]
             )
         except subprocess.CalledProcessError as e:
             if e.returncode != 2:
@@ -275,13 +281,3 @@ class TestForcedClientReenrollment(IntegrationTest):
         if not contents.startswith(nameserver):
             contents = nameserver + contents.replace(nameserver, '')
             client.put_file_contents(paths.RESOLV_CONF, contents)
-
-
-@pytest.fixture()
-def client(request):
-    tasks.install_client(request.cls.master, request.cls.clients[0])
-
-    def teardown_client():
-        tasks.uninstall_client(request.cls.clients[0])
-        request.cls.delete_client_host_entry()
-    request.addfinalizer(teardown_client)