git.iko.soy/project-m36
on master help sign in
cleanup GHC warnings
commit7b2ef25b4e5dbcabfb6abb5e6178b6dd65a1a4d4 authorAgentM <agentm@themactionfaction.com> dateThu 3 Aug 2017, 14:58 (9 years ago) parente04c0dd
2 files changed+3−7
compare with master
unifiedsplit
test/TransactionGraph/Automerge.hs+1−4 test/TransactionGraph/Merge.hs+2−3
test/TransactionGraph/Automerge.hs+1−4
@@ -7,9 +7,6 @@ import TutorialD.Interpreter.TestBase
77
88import System.Exit
99
10−import ProjectM36.Relation.Show.Term
11−import Data.Text
12−
1310main :: IO ()
1411main = do
1512 tcounts <- runTestTT testList
@@ -66,7 +63,7 @@ testAutomergeFailure = TestCase $ do
6663 --should fail
6764 mergeRes <- autoMergeToHead sessionPastId conn UnionMergeStrategy headn
6865
69− p <- checkEither $ executeRelationalExpr sessionPastId conn (RelationVariable "s" ())
66+ _ <- checkEither $ executeRelationalExpr sessionPastId conn (RelationVariable "s" ())
7067
7168 assertEqual "merge failure" (Left (InclusionDependencyCheckError "s_pkey")) mergeRes
7269
test/TransactionGraph/Merge.hs+2−3
@@ -255,8 +255,7 @@ testUnionMergeIncDepViolation = TestCase $ do
255255 --check that the union merge fails due to a violated constraint
256256 let eMerge = mergeTransactions (fakeUUID 5) (fakeUUID 3) UnionMergeStrategy ("branchA", "branchB") graph''
257257 case eMerge of
258− Left (InclusionDependencyCheckError incDepName) -> pure ()
258+ Left (InclusionDependencyCheckError incDepName') -> assertEqual "incdep violation name" incDepName incDepName'
259259 Left err -> assertFailure ("other error: " ++ show err)
260− Right trans -> do
261− assertFailure "constraint violation missing"
260+ Right _ -> assertFailure "constraint violation missing"
262261