On 12/02/16 16:52, Martin Basti wrote:



On 12.02.2016 13:03, Milan Kubík wrote:
On 02/12/2016 10:59 AM, David Kupka wrote:
Sending one more topology test. This one creates a M groups
consisting N (N>=2) servers.
First two servers in each group are used to connect with nearest four
groups and also with the other servers inside the group (when N>2).
Servers inside the group (not connecting to other groups) are
connected with each other.

The patch set needs freeipa-dkupka-8{1,2,3} applied.

ACK

I cannot apply patches, please rebase

[mbasti@dhcp129-96 freeipa-devel]$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
[mbasti@dhcp129-96 freeipa-devel]$ git am freeipa-dkupka-008* -3
Applying: CI: Add '2-connected' topology generator.
Applying: CI: Add simple replication test in 2-connected topology.
Applying: CI: Add test for 2-connected topology generator.
Applying: CI: Add double circle topology.
Applying: CI: Add replication test utilizing double-circle topology.
Applying: CI: Add test for double-circle topology generator.
error: invalid object 100644 e12d141391840cc7f9150a178875393a96dd469b
for 'ipatests/test_integration/test_topologies.py'
fatal: git-write-tree: error building trees
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0006 CI: Add test for double-circle topology generator.
The copy of the patch that failed is found in:
    /home/mbasti/work/freeipa-devel/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Martin^2

Git fails to apply patches because wrong version of freeipa-dkupka-008{1,2,3} was pushed. Attached patches should fix it.

--
David Kupka
From 676701253f034a335f603a917e24926e2bb41992 Mon Sep 17 00:00:00 2001
From: David Kupka <dku...@redhat.com>
Date: Thu, 18 Feb 2016 09:52:55 +0100
Subject: [PATCH 1/2] CI: Fix pep8 errors in 2-connected topology generator

---
 ipatests/test_integration/tasks.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index d37b616bd6efe437a1a979cc7a9ad8c7ea803773..77cba89825574f5354017bf184b106e94eb75c59 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -857,6 +857,7 @@ def tree2_topo(master, replicas):
         yield master, replica
         master = replica
 
+
 @_topo('2-connected')
 def two_connected_topo(master, replicas):
     r"""No replica has more than 4 agreements and at least two
@@ -892,24 +893,24 @@ def two_connected_topo(master, replicas):
 
         v2 = pool.pop(0)
         yield v0, v2
-        grow.append((v0,v2))
+        grow.append((v0, v2))
 
         v3 = pool.pop(0)
         yield v2, v3
         yield v1, v3
-        grow.append((v1,v3))
+        grow.append((v1, v3))
 
-        for (r,s) in grow:
+        for (r, s) in grow:
             t = pool.pop(0)
 
-            for (u,v) in [(r,t), (s,t)]:
+            for (u, v) in [(r, t), (s, t)]:
                 yield u, v
                 w = pool.pop(0)
                 yield u, w
                 x = pool.pop(0)
                 yield v, x
                 yield w, x
-                grow.append((w,x))
+                grow.append((w, x))
 
     except IndexError:
         return
-- 
2.5.0

From a5e900de20e63896bbca3a3fb53180d8207859eb Mon Sep 17 00:00:00 2001
From: David Kupka <dku...@redhat.com>
Date: Thu, 18 Feb 2016 09:55:53 +0100
Subject: [PATCH 2/2] CI: add empty topology test for 2-connected topology
 generator

---
 ipatests/test_integration/test_topologies.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ipatests/test_integration/test_topologies.py b/ipatests/test_integration/test_topologies.py
index f5332adbef12e8c18471592d4fd5c89097e2d4ed..e12d141391840cc7f9150a178875393a96dd469b 100644
--- a/ipatests/test_integration/test_topologies.py
+++ b/ipatests/test_integration/test_topologies.py
@@ -115,3 +115,4 @@ def test_topology_two_connected():
         (4, 8),
         (7, 8),
     ]
+    assert list(topo('M', [])) == []
-- 
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