Patch attached, to work properly it requires all patches I sent today + workaround patch attached (Martin3 will provide proper fix).

The last two test are failing due to bug in test framework (ipa-replica-manage should not be used with domain level1)


Martin^2
From 37e3d205ab91bf753f199b61a7b4c1c574ea7769 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Sun, 6 Dec 2015 18:46:45 +0100
Subject: [PATCH] CI: uninstall WORKAROUND DO NOT PUSH

---
 ipatests/test_integration/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index e75fe505f5ad9b5ffe680f7e37dec6873616ca05..a0d599d52d4edb9471b6a0cedd155a8590d0889b 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -616,7 +616,7 @@ def kinit_admin(host):
 
 def uninstall_master(host):
     host.collect_log(paths.IPASERVER_UNINSTALL_LOG)
-
+    host.run_command(['ipactl', 'stop'], raiseonerr=False)  # temporal workaround
     host.run_command(['ipa-server-install', '--uninstall', '-U'],
                      raiseonerr=False)
     host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'],
-- 
2.5.0

From fae0ea3409641b2373bf074849b8a847dd2453c8 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Fri, 4 Dec 2015 13:50:38 +0100
Subject: [PATCH] CI: test various topologies with multiple replicas

Test tests topologies listed bellow with and without CA on replicas:
star topology: 3 replicas
line topology: 3 replicas
complete topology: 3 replicas
---
 .../test_integration/test_replication_layouts.py   | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 ipatests/test_integration/test_replication_layouts.py

diff --git a/ipatests/test_integration/test_replication_layouts.py b/ipatests/test_integration/test_replication_layouts.py
new file mode 100644
index 0000000000000000000000000000000000000000..3a3e9641e8645c62c95c8d48ecf67f2dc32dbd4d
--- /dev/null
+++ b/ipatests/test_integration/test_replication_layouts.py
@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
+#
+
+import time
+
+from ipatests.test_integration.base import IntegrationTest
+from ipatests.test_integration import tasks
+
+
+class LayoutsBaseTest(IntegrationTest):
+
+    @classmethod
+    def install(cls, mh):
+        # tests use custom installation
+        pass
+
+    def replication_is_working(self):
+        test_user = 'replication-testuser'
+        self.master.run_command(
+            ['ipa', 'user-add', test_user, '--first', 'test', '--last', 'user']
+        )
+
+        time.sleep(60)  # make sure the replication of user is done
+
+        for r in self.replicas:
+            r.run_command(['ipa', 'user-show', test_user])
+
+
+class TestLineTopologyWithoutCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_line_topology_without_ca(self):
+        tasks.install_topo('line', self.master, self.replicas, [],
+                           setup_replica_cas=False)
+        self.replication_is_working()
+
+
+class TestLineTopologyWithCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_line_topology_with_ca(self):
+        tasks.install_topo('line', self.master, self.replicas, [],
+                           setup_replica_cas=True)
+        self.replication_is_working()
+
+
+class TestStarTopologyWithoutCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_star_topology_without_ca(self):
+        tasks.install_topo('star', self.master, self.replicas, [],
+                           setup_replica_cas=False)
+        self.replication_is_working()
+
+
+class TestStarTopologyWithCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_star_topology_with_ca(self):
+        tasks.install_topo('star', self.master, self.replicas, [],
+                           setup_replica_cas=True)
+        self.replication_is_working()
+
+
+class TestCompleteTopologyWithoutCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_complete_topology_without_ca(self):
+        tasks.install_topo('complete', self.master, self.replicas, [],
+                           setup_replica_cas=False)
+        self.replication_is_working()
+
+
+class TestCompleteTopologyWithCA(LayoutsBaseTest):
+
+    num_replicas = 3
+
+    def test_complete_topology_with_ca(self):
+        tasks.install_topo('complete', self.master, self.replicas, [],
+                           setup_replica_cas=True)
+        self.replication_is_working()
-- 
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