On Mon, Jun 22, 2015 at 03:27:14PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > From: Niklas Hambuechen <[email protected]> > > This renames the deprecated `printTestCase` to its replacement > `counterexample`, add provides a CPP-guarded fallback for QuickCheck < 2.7. > > Signed-off-by: Niklas Hambuechen <[email protected]> > Reviewed-by: Klaus Aehlig <[email protected]> > > Conflicts: > test/hs/Test/Ganeti/JQScheduler.hs > - removed file not present in 2.12 > test/hs/Test/Ganeti/SlotMap.hs > - removed file not present in 2.12 > > Cherry-picked-from: 077c415a09f8c381ce788ebe6c065d8ccab60564 > Signed-off-by: Petr Pudlak <[email protected]> > --- > doc/dev-codestyle.rst | 6 +- > test/hs/Test/Ganeti/BasicTypes.hs | 10 +-- > test/hs/Test/Ganeti/Confd/Utils.hs | 8 +- > test/hs/Test/Ganeti/HTools/Backend/Text.hs | 8 +- > test/hs/Test/Ganeti/HTools/Cluster.hs | 14 ++-- > test/hs/Test/Ganeti/HTools/Container.hs | 2 +- > test/hs/Test/Ganeti/HTools/Node.hs | 2 +- > test/hs/Test/Ganeti/HTools/Types.hs | 2 +- > test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs | 4 +- > test/hs/Test/Ganeti/JQueue.hs | 28 +++---- > test/hs/Test/Ganeti/Locking/Allocation.hs | 30 +++---- > test/hs/Test/Ganeti/Locking/Locks.hs | 4 +- > test/hs/Test/Ganeti/Locking/Waiting.hs | 46 +++++------ > test/hs/Test/Ganeti/Network.hs | 10 +-- > test/hs/Test/Ganeti/Objects.hs | 6 +- > test/hs/Test/Ganeti/OpCodes.hs | 2 +- > test/hs/Test/Ganeti/Query/Filter.hs | 8 +- > test/hs/Test/Ganeti/Query/Language.hs | 2 +- > test/hs/Test/Ganeti/Query/Query.hs | 104 > ++++++++++++------------- > test/hs/Test/Ganeti/Ssconf.hs | 2 +- > test/hs/Test/Ganeti/TestCommon.hs | 19 ++++- > test/hs/Test/Ganeti/Utils.hs | 54 ++++++------- > test/hs/Test/Ganeti/Utils/MultiMap.hs | 4 +- > test/hs/Test/Ganeti/Utils/Statistics.hs | 3 +- > 24 files changed, 196 insertions(+), 182 deletions(-)
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
