Skip to content

Commit 7306e69

Browse files
Denote supportedNetworks in hydra-cluster tests
1 parent 13e596f commit 7306e69

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

.github/workflows/check-tutorial.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
3636
with open("hydra-cluster/test/Test/CardanoNodeSpec.hs", "r") as cardanoNodeSpecFile:
3737
body = cardanoNodeSpecFile.read()
38-
expectedCardanoNodeVersion = re.findall(r"getCardanoNodeVersion.*([0-9]+\.[0-9]+\.[0-9]+)", body)[0]
38+
expectedCardanoNodeVersion = re.findall(r"supportedCardanoNodeVersion.*([0-9]+\.[0-9]+\.[0-9]+)", body)[0]
3939
4040
print("Checking used cardano-node version")
4141
if all(v == expectedCardanoNodeVersion for v in usedCardanoNodeVersions):

hydra-cluster/test/Test/CardanoNodeSpec.hs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,26 @@ import Hydra.Logging (Tracer, showLogsOnFailure)
1717
import System.Directory (doesFileExist)
1818
import Test.Hydra.Cluster.Utils (forEachKnownNetwork)
1919

20+
supportedNetworks :: [KnownNetwork]
21+
supportedNetworks = [Preview, Preproduction, Mainnet]
22+
23+
supportedCardanoNodeVersion :: String
24+
supportedCardanoNodeVersion = "8.9.0"
25+
26+
forSupportedKnownNetworks :: String -> (KnownNetwork -> IO ()) -> Spec
27+
forSupportedKnownNetworks msg action = forEachKnownNetwork msg $ \network -> do
28+
unless (network `elem` supportedNetworks) $
29+
pendingWith $
30+
"cardano-node " <> supportedCardanoNodeVersion <> " is only supported on " ++ show supportedNetworks
31+
action network
32+
2033
spec :: Spec
2134
spec = do
2235
-- NOTE: We also hard-code the cardano-node version here to allow prevent
2336
-- false positives test errors in case someone uses an "untested" /
2437
-- different than in shell.nix version of cardano-node and cardano-cli.
2538
it "has expected cardano-node version available" $
26-
getCardanoNodeVersion >>= (`shouldContain` "8.9.0")
39+
getCardanoNodeVersion >>= (`shouldContain` supportedCardanoNodeVersion)
2740

2841
around (failAfter 5 . setupTracerAndTempDir) $ do
2942
it "withCardanoNodeDevnet does start a block-producing devnet within 5 seconds" $ \(tr, tmp) ->
@@ -41,16 +54,18 @@ spec = do
4154

4255
describe "findRunningCardanoNode" $ do
4356
it "returns Nothing on non-matching network" $ \(tr, tmp) -> do
57+
unless (Preview `elem` supportedNetworks) $
58+
pendingWith "Preview is not supported so skipping this test."
4459
withCardanoNodeOnKnownNetwork tr tmp Preview $ \_ -> do
4560
findRunningCardanoNode tr tmp Preproduction `shouldReturn` Nothing
4661

4762
it "returns Just running node on matching network" $ \(tr, tmp) -> do
63+
unless (Preview `elem` supportedNetworks) $
64+
pendingWith "Preview is not supported so skipping this test."
4865
withCardanoNodeOnKnownNetwork tr tmp Preview $ \runningNode -> do
4966
findRunningCardanoNode tr tmp Preview `shouldReturn` Just runningNode
5067

51-
forEachKnownNetwork "withCardanoNodeOnKnownNetwork starts synchronizing within 10 seconds" $ \network -> do
52-
when (network == Sanchonet) $
53-
pendingWith "cardano-node 8.9 not anymore supported on sanchonet"
68+
forSupportedKnownNetworks "withCardanoNodeOnKnownNetwork starts synchronizing within 10 seconds" $ \network -> do
5469
-- NOTE: This implies that withCardanoNodeOnKnownNetwork does not
5570
-- synchronize the whole chain before continuing.
5671
setupTracerAndTempDir $ \(tr, tmp) ->

0 commit comments

Comments
 (0)