As discussed offline; will send this to an earlier version, probably 2.12 as it appears the test had been broken for a while already; we were just not running it on a configuration which would show that.
On Mon, Jun 15, 2015 at 5:07 PM, Helga Velroyen <[email protected]> wrote: > LGTM > > If this is not obvious in the failing test, maybe an extra unit test to > match these would make sense? > > On Mon, 15 Jun 2015 at 17:02 'Hrvoje Ribicic' via ganeti-devel < > [email protected]> wrote: > >> commit f5103bdbc10cdcb62c3f90f046e217bffe175040 >> Author: Hrvoje Ribicic <[email protected]> >> Date: Mon Jun 15 14:56:03 2015 +0000 >> >> 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. >> >> Signed-off-by: Hrvoje Ribicic <[email protected]> >> >> 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 >> > 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
