X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3a3c1eb4dc10a093c380dd5e6627c600a2c6b0e7..e243651150a18fc469a4b0c62cd0fa8c7e2584dc:/Ganeti/HTools/QC.hs

diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
index 1d83142..c23e81d 100644
--- a/Ganeti/HTools/QC.hs
+++ b/Ganeti/HTools/QC.hs
@@ -69,7 +69,7 @@ instance Arbitrary Instance.Instance where
       pn <- arbitrary
       sn <- arbitrary
       vcpus <- arbitrary
-      return $ Instance.create name mem dsk vcpus run_st pn sn
+      return $ Instance.create name mem dsk vcpus run_st [] pn sn
 
 -- and a random node
 instance Arbitrary Node.Node where
@@ -170,13 +170,13 @@ prop_Instance_runStatus_True inst =
     let run_st = Instance.running inst
         run_tx = Instance.runSt inst
     in
-      run_tx == "running" || run_tx == "ERROR_up" ==> run_st
+      run_tx `elem` Instance.runningStates ==> run_st
 
 prop_Instance_runStatus_False inst =
     let run_st = Instance.running inst
         run_tx = Instance.runSt inst
     in
-      run_tx /= "running" && run_tx /= "ERROR_up" ==> not run_st
+      run_tx `notElem` Instance.runningStates ==> not run_st
 
 testInstance =
     [ run prop_Instance_setIdx
@@ -199,8 +199,9 @@ prop_Text_Load_Instance name mem dsk vcpus status pnode snode pdx sdx =
                then sdx + 1
                else sdx
         ndx = [(pnode, pdx), (rsnode, rsdx)]
+        tags = ""
         inst = Text.loadInst ndx
-               [name, mem_s, dsk_s, vcpus_s, status, pnode, rsnode]::
+               [name, mem_s, dsk_s, vcpus_s, status, pnode, rsnode, tags]::
                Maybe (String, Instance.Instance)
         _types = ( name::String, mem::Int, dsk::Int
                  , vcpus::Int, status::String