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

[Martin Basti]

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