On Tue, Jul 30, 2013 at 1:30 PM, Jose A. Lopes <[email protected]> wrote: > From: "Jose A. Lopes" <[email protected]> > > Removed useless comments and fixed some error messages. >
Present form. Also, should this (and maybe also 2/6) go in before the main one? > Signed-off-by: Jose A. Lopes <[email protected]> > --- > src/Ganeti/OpCodes.hs | 4 ++-- > test/hs/Test/Ganeti/OpCodes.hs | 13 ------------- > 2 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/src/Ganeti/OpCodes.hs b/src/Ganeti/OpCodes.hs > index 575a836..e9a7a21 100644 > --- a/src/Ganeti/OpCodes.hs > +++ b/src/Ganeti/OpCodes.hs > @@ -127,7 +127,7 @@ instance PyValue VerifyOptionalChecks where > showValue = verifyOptionalChecksToRaw > > instance PyValue INicParams where > - showValue = undefined > + showValue = error "instance PyValue INicParams: not implemented" > > instance PyValue a => PyValue (JSObject a) where > showValue obj = > @@ -500,7 +500,7 @@ $(genOpCode "OpCode" > ], > "node_name") > , ("OpInstanceCreate", > - [t| [NonEmptyString] |], -- edit: ht.Comment("instance > nodes")(ht.TListOf(ht.TNonEmptyString)) > + [t| [NonEmptyString] |], > OpDoc.opInstanceCreate, > [ pInstanceName > , pForceVariant > diff --git a/test/hs/Test/Ganeti/OpCodes.hs b/test/hs/Test/Ganeti/OpCodes.hs > index 889a668..19da5af 100644 > --- a/test/hs/Test/Ganeti/OpCodes.hs > +++ b/test/hs/Test/Ganeti/OpCodes.hs > @@ -564,18 +564,6 @@ prop_setOpComment op comment = > let (OpCodes.MetaOpCode common _) = OpCodes.setOpComment comment op > in OpCodes.opComment common ==? Just comment > > --- -- | Tests wrong tag object building (cluster takes only jsnull, the > --- -- other take a string, so we test the opposites). > --- case_TagObject_fail :: Assertion > --- case_TagObject_fail = > --- mapM_ (\(t, j) -> assertEqual (show t ++ "/" ++ J.encode j) Nothing $ > --- tagObjectFrom t j) > --- [ (TagTypeCluster, J.showJSON "abc") > --- , (TagTypeInstance, J.JSNull) > --- , (TagTypeNode, J.JSNull) > --- , (TagTypeGroup, J.JSNull) > --- ] > - > -- | Tests wrong (negative) disk index. > prop_mkDiskIndex_fail :: QuickCheck.Positive Int -> Property > prop_mkDiskIndex_fail (Positive i) = > @@ -615,7 +603,6 @@ testSuite "OpCodes" > , 'case_py_compat_types > , 'case_py_compat_fields > , 'prop_setOpComment > - -- , 'case_TagObject_fail How did this get commented out, before being removed? I see it as running now... Thanks, Guido
