On Mon, Jun 22, 2015 at 03:27:12PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > From: Niklas Hambuechen <[email protected]> > > This makes our test compile with out errors with QuickCheck 2.7. > Warnings about the deprecation of printTestCase remain when using 2.7. > > This change is backwards-compatible with all older versions of QuickCheck > that we support. > > In 2.7, Property is no longer a monad, but remains a `Gen Prop` inside, > so that we only have to use combinations of `property` and `return` > to become compatible. > > See > https://hackage.haskell.org/package/QuickCheck-2.7.6/changelog > > Further, in QuickCheck 2.7, Positive/NonZero/NonNegative are no longer > instances of `Integral` (NonNegative could likely still be one, see > https://github.com/nick8325/quickcheck/issues/31). > Consequently we cannot create them using `fromIntegral` any more, > and switch to `fromEnum` instead, which also is backwards-compatible. > > 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 > > Cherry-picked-from: 4320ba1dcfe49b659abbc46a6cf37e6a4db66f22 > Signed-off-by: Petr Pudlak <[email protected]> > --- > test/hs/Test/Ganeti/HTools/Types.hs | 24 ++++++++++++------------ > test/hs/Test/Ganeti/JQueue.hs | 5 +++-- > test/hs/Test/Ganeti/JSON.hs | 5 +++-- > test/hs/Test/Ganeti/Objects/BitArray.hs | 4 ++-- > test/hs/Test/Ganeti/Storage/Drbd/Types.hs | 12 ++++++------ > test/hs/Test/Ganeti/TestCommon.hs | 2 +- > test/hs/Test/Ganeti/Utils.hs | 8 ++++---- > 7 files changed, 31 insertions(+), 29 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
