LGTM, thanks On Mon, Jun 15, 2015 at 6:46 PM, 'Hrvoje Ribicic' via ganeti-devel < [email protected]> wrote:
> commit fa9bb3c54af9f1ecb537a518bf1b2f7f76354e49 > Author: Hrvoje Ribicic <[email protected]> > Date: Mon Jun 15 18:45:18 2015 +0200 > > Fix user and group ordering in test > > One of our Haskell tests asserts that the Python and Haskell user and > group constants match. This patch fixes the order in which the mock > Python code outputs the users and groups to match the order of the > Haskell-side enumeration. > > diff --git a/test/hs/Test/Ganeti/Runtime.hs > b/test/hs/Test/Ganeti/Runtime.hs > index b15aa36..ee48e0e 100644 > --- a/test/hs/Test/Ganeti/Runtime.hs > +++ b/test/hs/Test/Ganeti/Runtime.hs > @@ -89,23 +89,23 @@ case_UsersGroups = do > \from ganeti import serializer\n\ > \import sys\n\ > \users = [constants.MASTERD_USER,\n\ > + \ constants.METAD_USER,\n\ > \ constants.NODED_USER,\n\ > \ constants.RAPI_USER,\n\ > \ constants.CONFD_USER,\n\ > \ constants.WCONFD_USER,\n\ > \ constants.KVMD_USER,\n\ > \ constants.LUXID_USER,\n\ > - \ constants.METAD_USER,\n\ > \ constants.MOND_USER,\n\ > \ ]\n\ > \groups = [constants.MASTERD_GROUP,\n\ > + \ constants.METAD_GROUP,\n\ > \ constants.NODED_GROUP,\n\ > \ constants.RAPI_GROUP,\n\ > \ constants.CONFD_GROUP,\n\ > \ constants.WCONFD_GROUP,\n\ > \ constants.KVMD_GROUP,\n\ > \ constants.LUXID_GROUP,\n\ > - \ constants.METAD_GROUP,\n\ > \ constants.MOND_GROUP,\n\ > \ constants.DAEMONS_GROUP,\n\ > \ constants.ADMIN_GROUP,\n\ > Hrvoje Ribicic > Ganeti Engineering > Google Germany GmbH > Dienerstr. 12, 80331, München > > Geschäftsführer: Graham Law, Christine Elizabeth Flores > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > -- Petr Pudlák Software Engineer [email protected]  Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Graham Law, Christine Elizabeth Flores Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
