[Freeipa-devel] [PATCH 0002] TEST: Stageuser plugin

[Lenka Doudova]

Attached.
Lenka

On 08/24/2015 03:14 PM, Martin Basti wrote:
> NACK
>
> You have unmerged changes in the patch
>
> On 08/24/2015 02:14 PM, Lenka Doudova wrote:
>>   from ipatests.test_xmlrpc import objectclasses
>> +<<<<<<< HEAD
>>   from ipatests.test_xmlrpc.xmlrpc_test import (
>>       Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci, add_sid, 
>> add_oc)
>> +=======
>> +from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, 
>> fuzzy_set_ci,
>> +                         add_sid, add_oc, XMLRPC_test, raises_exact)
>> +>>>>>>> Automated test for stageuser plugin
>>   from ipapython.dn import DN
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: freeipa-master-lryznaro-0002.4-Automated-test-for-stageuser-plugin.patch
Type: text/x-patch
Size: 55815 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20150824/365a8cbb/attachment.bin>