From 26048f6804c2933344e39e98213662086f003b3b Mon Sep 17 00:00:00 2001 From: Cmdv Date: Mon, 13 May 2024 16:27:08 +0100 Subject: [PATCH] increase timeout times for jsonb tests to work in CI --- .../Cardano/Db/Mock/Unit/Conway/Config/JsonbInSchema.hs | 8 ++++---- cardano-db-sync/src/Cardano/DbSync.hs | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/JsonbInSchema.hs b/cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/JsonbInSchema.hs index 6be68b5b8..88c1370da 100644 --- a/cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/JsonbInSchema.hs +++ b/cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/JsonbInSchema.hs @@ -23,7 +23,7 @@ configJsonbInSchemaTrue ioManager metadata = do where action = \_interpreter _mockServer dbSync -> do startDBSync dbSync - threadDelay 2_000_000 + threadDelay 5_000_000 assertEqQuery dbSync DB.queryJsonbInSchemaExists @@ -52,7 +52,7 @@ configJsonbInSchemaFalse ioManager metadata = do where action = \_interpreter _mockServer dbSync -> do startDBSync dbSync - threadDelay 2_000_000 + threadDelay 5_000_000 assertEqQuery dbSync DB.queryJsonbInSchemaExists @@ -81,7 +81,7 @@ configJsonbInSchemaShouldError ioManager metadata = do where action = \_interpreter _mockServer dbSync -> do startDBSync dbSync - threadDelay 2_000_000 + threadDelay 5_000_000 stopDBSync dbSync let newDbSyncEnv = dbSync @@ -94,7 +94,7 @@ configJsonbInSchemaShouldError ioManager metadata = do } } startDBSync newDbSyncEnv - threadDelay 2_000_000 + threadDelay 5_000_000 -- Expected to fail checkStillRuns dbSync diff --git a/cardano-db-sync/src/Cardano/DbSync.hs b/cardano-db-sync/src/Cardano/DbSync.hs index 0cd0164ba..39da87942 100644 --- a/cardano-db-sync/src/Cardano/DbSync.hs +++ b/cardano-db-sync/src/Cardano/DbSync.hs @@ -224,7 +224,6 @@ runSyncNode metricsSetters trce iomgr dbConnString ranMigrations runMigrationFnc case dncShelleyHardFork cfg of HardFork.TriggerHardForkAtEpoch (EpochNo 0) -> True _other -> False - -- isJsonBInSchemaConfig = isAddJsonbToSchemaEnabled (sioAddJsonbToSchema (dncInsertOptions syncNodeConfigFromFile)) isJsonBInSchemaConfig = ioAddJsonbToSchema $ soptInsertOptions syncOptions maybeLedgerDir = enpMaybeLedgerStateDir syncNodeParams