test: fix the macroscope failure test

change-metrics · Dec 21, 2023 · 5cac8e3 · 5cac8e3
1 parent 2475a4e
commit 5cac8e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/Lentille.hs b/src/Lentille.hs
@@ -151,7 +151,7 @@ type Changes = (Change, [ChangeEvent])
 -- We don't care about the rest so we replace it with ()
 -- See: https://hackage.haskell.org/package/streaming-0.2.4.0/docs/Streaming-Prelude.html#v:break
 --
--- >>> let stream = S.yield (Left (DecodeError ["oops"]))
+-- >>> let stream = S.yield (Left (DecodeError [utctime|2021-05-31 00:00:00|] ["oops"]))
 -- >>> runEff $ S.length_ $ streamDropBefore [utctime|2021-05-31 00:00:00|] stream
 -- 1
 streamDropBefore :: UTCTime -> LentilleStream es Changes -> LentilleStream es Changes

diff --git a/src/Macroscope/Test.hs b/src/Macroscope/Test.hs
@@ -53,9 +53,11 @@ testCrawlingPoint = do
       Macroscope.runStream apiKey indexName (CrawlerName crawlerName) (Macroscope.Changes badStream)
 
       (currentOldestAge, _) <- getOldest
-      liftIO $ assertEqual "Commit date is not updated on failure" oldestAge currentOldestAge
+      liftIO $ assertBool "Commit date is updated on failure" (currentOldestAge > oldestAge)
 
-      Macroscope.runStream apiKey indexName (CrawlerName crawlerName) (Macroscope.Changes goodStream)
+      -- TODO: check that the errors got indexed
+
+      Macroscope.runStream apiKey indexName (CrawlerName crawlerName) (Macroscope.Changes $ goodStream currentOldestAge)
 
       (newOldestAge, _) <- getOldest
       liftIO $ assertBool "Commit date updated" (newOldestAge > oldestAge)
@@ -68,8 +70,8 @@ testCrawlingPoint = do
     | otherwise = error "Bad crawling point"
 
   -- A document stream that yield a change
-  goodStream date name
-    | date == BT.fakeDateAlt && name == "opendev/neutron" = do
+  goodStream expected date name
+    | date == expected && name == "opendev/neutron" = do
         Streaming.yield $ Right (fakeChangePB, [])
     | otherwise = error "Bad crawling point"
 

diff --git a/src/Macroscope/Worker.hs b/src/Macroscope/Worker.hs
@@ -103,8 +103,8 @@ processStream logFunc postFunc = go (0 :: Word) [] []
       Right (edoc, rest) -> do
         -- We got a new document
         let doc = case edoc of
-             Right x -> x
-             Left err -> DTError $ from err
+              Right x -> x
+              Left err -> DTError $ from err
         let newAcc = doc : acc
         if count == 499
           then do