[Freeipa-devel] [TEST][patch-0035] Test replica installed under domain level 0 is functional after domain upgrade

[Martin Babinsky]

On 04/15/2016 01:23 PM, Oleg Fayans wrote:
> Hi Martin & Martin,
>
> The updated patches are included. both apply cleanly and pass pylint
>
> On 04/14/2016 02:17 PM, Martin Basti wrote:
>>
>>
>> On 14.04.2016 14:04, Oleg Fayans wrote:
>>> The new version disables a falsely failing pylint check for ldap_connect
>>> method in a master host instance.
>>>
>>> On 04/13/2016 10:30 AM, Oleg Fayans wrote:
>>>> Hi Martin,
>>>>
>>>> I've updated the patch with regard to your review. Thank you!
>>>>
>>>> On 04/12/2016 03:35 PM, Martin Babinsky wrote:
>>>>> On 04/07/2016 12:35 PM, Oleg Fayans wrote:
>>>>>>
>>>>>>
>>>>> Hi Oleg,
>>>>>
>>>>> since this is a part of replica promotion test suite please add the link
>>>>> to https://fedorahosted.org/freeipa/ticket/5723 to the commit message.
>>>> Done
>>>>
>>>>> The patch cannot be applied cleanly, even 3-way merge fails with:
>>>>>
>>>>> """
>>>>> git am
>>>>> ../review/ofayans/freeipa-ofayans-0035-Add-test-if-replica-is-working-after-domain-upgrade.patch
>>>>> -3
>>>>> Applying: Add test if replica is working after domain upgrade
>>>>> error: invalid object 100644 acae5c924594cc73bf262eeab5f843f252723207
>>>>> for 'ipatests/test_integration/test_replica_promotion.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 0001 Add test if replica is working after domain upgrade
>>>>> """
>>>>>
>>>>> I had to fall back to plain 'patch -p1'
>>>>>
>>>>> I have your previous patches 0033-0034 applied. The patch probably needs
>>>>> a rebase.
>>>> Fixed
>>>>
>>>>> Also I would be more happy if the username for 'testuser' was not
>>>>> hardcoded in the code. You can factor it out as a class member.
>>>>>
>>>> Done
>>>>
>>>>
>>>>
>>>
>>>
>>
>> I suggest to put missing member here:
>>
>> diff --git a/pylint_plugins.py b/pylint_plugins.py
>> index c3042f4..7a421ab 100644
>> --- a/pylint_plugins.py
>> +++ b/pylint_plugins.py
>> @@ -230,6 +230,7 @@ ipa_class_members = {
>>               {'transport': ['put_file']},
>>               'put_file_contents',
>>               'get_file_contents',
>> +            'ldap_connect',
>>           ]},
>>           'replicas',
>>           'clients',
>>
>> instead of disabling the check locally (untested)
>>
>> Martin^2
>
ACK, but I think it would be good idea to merge the patches before pushing.

-- 
Martin^3 Babinsky