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

[Martin Babinsky]

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.

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.

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.

-- 
Martin^3 Babinsky