Commit ce003543 authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix build breakage after exclusive storage commits



This fixes:

htest/Test/Ganeti/Rpc.hs:50:14:
    Couldn't match expected type `Rpc.RpcCallNodeInfo'
           against inferred type `Data.Map.Map String Bool
                                  -> Rpc.RpcCallNodeInfo'
    In the first argument of `(<$>)', namely `Rpc.RpcCallNodeInfo'
    In the first argument of `(<*>)', namely
        `Rpc.RpcCallNodeInfo <$> arbitrary'

by adding the new parameter (empty map for now), and also:

ganeti/constants.py:432:5: E123 closing bracket does not match
   indentation of opening bracket's line

By switching to 2-char indentation and (for consistency) also replaces
frozenset(…) with our unique checker (UniqueFrozenset).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarBernardo Dal Seno <bdalseno@google.com>
parent 6ebfef42
......@@ -32,6 +32,7 @@ import Test.QuickCheck
import Test.QuickCheck.Monadic (monadicIO, run, stop)
import Control.Applicative
import qualified Data.Map as Map
import Test.Ganeti.TestHelper
import Test.Ganeti.TestCommon
......@@ -47,7 +48,8 @@ instance Arbitrary Rpc.RpcCallInstanceList where
arbitrary = Rpc.RpcCallInstanceList <$> arbitrary
instance Arbitrary Rpc.RpcCallNodeInfo where
arbitrary = Rpc.RpcCallNodeInfo <$> arbitrary <*> arbitrary
arbitrary = Rpc.RpcCallNodeInfo <$> arbitrary <*> arbitrary <*>
pure Map.empty
-- | Monadic check that, for an offline node and a call that does not
-- offline nodes, we get a OfflineNodeError response.
......
......@@ -424,12 +424,12 @@ DTS_FILEBASED = compat.UniqueFrozenset([
DTS_EXCL_STORAGE = frozenset([DT_PLAIN])
# templates for which we don't perform checks on free space
DTS_NO_FREE_SPACE_CHECK = frozenset([
DT_FILE,
DT_SHARED_FILE,
DT_RBD,
DT_EXT,
])
DTS_NO_FREE_SPACE_CHECK = compat.UniqueFrozenset([
DT_FILE,
DT_SHARED_FILE,
DT_RBD,
DT_EXT,
])
# logical disk types
LD_LV = "lvm"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment