From 5c79fa03515be3d33629923fcc14b10e0ddbd6fe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Mar 2014 16:40:52 -0400 Subject: [PATCH] avoid generating arbitrary MetaData with illegal fields --- Types/MetaData.hs | 4 +++- doc/bugs/git_annex_test_under_windows_8.1.mdwn | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Types/MetaData.hs b/Types/MetaData.hs index 706d037bcc..8df56734dd 100644 --- a/Types/MetaData.hs +++ b/Types/MetaData.hs @@ -264,7 +264,9 @@ parseMetaData p = (,) instance Arbitrary MetaData where arbitrary = do size <- arbitrarySizedBoundedIntegral `suchThat` (< 500) - MetaData . M.fromList <$> vector size + MetaData . M.filterWithKey legal . M.fromList <$> vector size + where + legal k _v = legalField $ fromMetaField k instance Arbitrary MetaValue where arbitrary = MetaValue <$> arbitrary <*> arbitrary diff --git a/doc/bugs/git_annex_test_under_windows_8.1.mdwn b/doc/bugs/git_annex_test_under_windows_8.1.mdwn index efdd8f2cfd..2ca64eb61a 100644 --- a/doc/bugs/git_annex_test_under_windows_8.1.mdwn +++ b/doc/bugs/git_annex_test_under_windows_8.1.mdwn @@ -62,3 +62,6 @@ e s tDse.t # End of transcript or log. """]] + +> A sort of windows-specific bug in the test suite. I've fixed it. [[done]] +> --[[Joey]]