[Freeipa-devel] [PATCH 0084-0086] CI: Add double circle topology

[Martin Basti]

On 24.02.2016 10:07, David Kupka wrote:
> On 24/02/16 08:27, David Kupka wrote:
>> On 23/02/16 17:54, Martin Basti wrote:
>>>
>>>
>>> On 23.02.2016 17:33, Martin Basti wrote:
>>>>
>>>>
>>>> On 23.02.2016 17:30, Martin Basti wrote:
>>>>>
>>>>>
>>>>> On 18.02.2016 10:14, David Kupka wrote:
>>>>>> 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 at dhcp129-96 freeipa-devel]$ git checkout master
>>>>>>> Switched to branch 'master'
>>>>>>> Your branch is up-to-date with 'origin/master'.
>>>>>>> [mbasti at 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.
>>>>>>
>>>>> Sorry my bad.
>>>>>
>>>>> ACK
>>>>>
>>>>> Pushed to:
>>>>> ipa-4-3: ffe3731ae7813fcc3246a83e37d62fc2754bb4ca
>>>>> master: acdabba6ec0f68841f02c1e6ad65232de81bb505
>>>>>
>>>> New test:
>>>>
>>>> Pushed to:
>>>> master: a1e582b33c42bcc8a708777afb975e7dc571ee3d
>>>> ipa-4-3: 2efa60637111e40a9ac9459d507d9f55a2ae301a
>>>>
>>> Revert?
>>> IMO this will not work on python3
>>>
>>> ************* Module ipatests.test_integration.test_topologies
>>> ipatests/test_integration/test_topologies.py:124:
>>> [W1638(range-builtin-not-iterating), test_topology_double_circle_topo]
>>> range built-in referenced when not iterating)
>>> ************* Module ipatests.test_integration.tasks
>>> ipatests/test_integration/tasks.py:949: [W0110(deprecated-lambda),
>>> double_circle_topo] map/filter on lambda could be replaced by
>>> comprehension)
>>> ipatests/test_integration/tasks.py:949:
>>> [W1636(map-builtin-not-iterating), double_circle_topo] map built-in
>>> referenced when not iterating)
>>> ipatests/test_integration/tasks.py:949:
>>> [W1637(zip-builtin-not-iterating), double_circle_topo] zip built-in
>>> referenced when not iterating)
>>>
>>
>> You can revert it and I will send fixed patches or you can just apply
>> attached patch.
>>
>>
> Updated patch attached.
>
ACK

Pushed to:
master: 775ee77bcc091ba31fdd3e59f8d45d0b646a44a0
ipa-4-3: 05539761cd6f7bd6ce40b687b913be81eabf69e1