See commit message.

--
Martin^3 Babinsky
From 108ce5787620227ef657c8e655dd3427655ebd06 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Thu, 10 Dec 2015 16:32:35 +0100
Subject: [PATCH] CI tests: remove '-p' option from ipa-dns-install calls

fix for https://fedorahosted.org/freeipa/ticket/4933 made ipa-dns-install to
use LDAPI and deprecated -p option for directory manager password. This patche
remove the option from calls to ipa-dns-install in CI tests so that
deprecation warning does not clutter the logs.
---
 ipatests/test_integration/tasks.py                   | 3 +--
 ipatests/test_integration/test_backup_and_restore.py | 1 -
 ipatests/test_integration/test_dnssec.py             | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index c3681fca952807ac6ebcca56ce961df2d3f33f0c..eb1378ef4ba8b5ec27034c8a0c429fd6114cd0a0 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -935,7 +935,7 @@ def resolve_record(nameserver, query, rtype="SOA", retry=True, timeout=100):
 def install_kra(host, domain_level=None, first_instance=False, raiseonerr=True):
     if not domain_level:
        domain_level = domainlevel(host)
-    command = ["ipa-kra-install", "-U", "-p", host.config.dirman_password]
+    command = ["ipa-kra-install", "-U"]
     if domain_level == DOMAIN_LEVEL_0 and not first_instance:
         replica_file = get_replica_filename(host)
         command.append(replica_file)
@@ -957,7 +957,6 @@ def install_dns(host, raiseonerr=True):
     args = [
         "ipa-dns-install",
         "--forwarder", host.config.dns_forwarder,
-        "-p", host.config.dirman_password,
         "-U",
     ]
     return host.run_command(args, raiseonerr=raiseonerr)
diff --git a/ipatests/test_integration/test_backup_and_restore.py b/ipatests/test_integration/test_backup_and_restore.py
index 8b9cd2dc4af146b2c00e6d2224625c4288854be8..b8abb343b027a9b61c6c2d8660ac2e926c5e70bf 100644
--- a/ipatests/test_integration/test_backup_and_restore.py
+++ b/ipatests/test_integration/test_backup_and_restore.py
@@ -285,7 +285,6 @@ class BaseBackupAndRestoreWithDNSSEC(IntegrationTest):
             "ipa-dns-install",
             "--dnssec-master",
             "--forwarder", cls.master.config.dns_forwarder,
-            "-p", cls.master.config.dirman_password,
             "-U",
         ]
         cls.master.run_command(args)
diff --git a/ipatests/test_integration/test_dnssec.py b/ipatests/test_integration/test_dnssec.py
index 5d6acb7cc0d843929fd23e5a07f37803cbfdb792..a4387d353d0a72c107978bb292561dde312a9721 100644
--- a/ipatests/test_integration/test_dnssec.py
+++ b/ipatests/test_integration/test_dnssec.py
@@ -91,7 +91,6 @@ class TestInstallDNSSECLast(IntegrationTest):
             "ipa-dns-install",
             "--dnssec-master",
             "--forwarder", self.master.config.dns_forwarder,
-            "-p", self.master.config.dirman_password,
             "-U",
         ]
         self.master.run_command(args)
@@ -249,7 +248,6 @@ class TestInstallDNSSECFirst(IntegrationTest):
             "ipa-dns-install",
             "--dnssec-master",
             "--forwarder", cls.master.config.dns_forwarder,
-            "-p", cls.master.config.dirman_password,
             "-U",
         ]
         cls.master.run_command(args)
@@ -423,7 +421,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
             "ipa-dns-install",
             "--dnssec-master",
             "--forwarder", cls.master.config.dns_forwarder,
-            "-p", cls.master.config.dirman_password,
             "-U",
         ]
         cls.master.run_command(args)
@@ -458,7 +455,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
             "ipa-dns-install",
             "--disable-dnssec-master",
             "--forwarder", self.master.config.dns_forwarder,
-            "-p", self.master.config.dirman_password,
             "--force",
             "-U",
         ]
@@ -474,7 +470,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
             "--dnssec-master",
             "--kasp-db", replica_backup_filename,
             "--forwarder", self.master.config.dns_forwarder,
-            "-p", self.master.config.dirman_password,
             "-U",
         ]
         self.replicas[0].run_command(args)
-- 
2.5.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to