use test-config for hydra-node

cardano-scaling · Sep 17, 2024 · c0c0a25 · c0c0a25
1 parent 50fe2ac
commit c0c0a25
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 8 deletions.
diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml
@@ -47,16 +47,18 @@ jobs:
     - name: ❓ Test
       if: ${{ matrix.package != 'hydra-tui'
            && matrix.package != 'hydra-cluster'
+           && matrix.package != 'hydra-node'
            }}
       run: |
         cd ${{ matrix.package }}
         nix build .#${{ matrix.package }}-tests
         nix develop .#${{ matrix.package }}-tests --command tests
 
     - name: ❓ Test
-      if: ${{ matrix.package == 'hydra-cluster' }}
+      if: ${{ matrix.package == 'hydra-cluster'
+           || matrix.package == 'hydra-node' }}
       run: |
-        nix build --option sandbox false .#checks.x86_64-linux.${{ matrix.package }}
+        nix build --option sandbox false .#checks.x86_64-linux.${{ matrix.package }} -L
 
     - name: ❓ Test (TUI)
       id: test_tui

diff --git a/flake.nix b/flake.nix
@@ -155,6 +155,34 @@
               ];
               treefmt = pkgs.treefmt;
             };
+            hydra-node = makeTest {
+              name = "hydra-node";
+              nodes = {
+                hydraNode = { ... }: {
+                  environment.systemPackages = [
+                    pkgs.cardano-node
+                    pkgs.cardano-cli
+                    pkgs.check-jsonschema
+                  ];
+                  networking.firewall.enable = false;
+                  imports = [ ];
+                  virtualisation = {
+                    cores = 16;
+                    memorySize = 16384;
+                  };
+                };
+              };
+
+              testScript = ''
+                hydraNode.wait_for_unit("multi-user.target")
+                hydraNode.succeed("cp ${self}/hydra-node/golden . -r")
+                hydraNode.succeed("cp ${self}/hydra-node/json-schemas . -r")
+                hydraNode.succeed("mkdir -p test")
+                hydraNode.succeed("cp ${self}/hydra-node/test/tls test/ -r")
+                hydraNode.succeed("${hsPkgs.hydra-node.components.exes.test-exe}/bin/test-exe")
+              '';
+            };
+
             hydra-cluster = makeTest {
               name = "hydra-cluster";
               nodes = {

diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -136,8 +136,6 @@ executable hydra-cluster
 common test-config
   import:             project-config
   hs-source-dirs:     test
-  main-is:            Main.hs
-  type:               exitcode-stdio-1.0
   other-modules:
     Paths_hydra_cluster
     Spec

diff --git a/hydra-node/hydra-node.cabal b/hydra-node/hydra-node.cabal
@@ -264,7 +264,7 @@ benchmark micro
 
   ghc-options:    -threaded -rtsopts
 
-test-suite tests
+common test-config
   import:             project-config
   ghc-options:        -threaded -rtsopts -with-rtsopts=-N
   hs-source-dirs:     test
@@ -369,3 +369,13 @@ test-suite tests
 
   build-tool-depends: hspec-discover:hspec-discover
   ghc-options:        -threaded -rtsopts
+
+test-suite tests
+  import:  test-config
+  type:    exitcode-stdio-1.0
+  main-is: Main.hs
+
+executable test-exe
+  import:  test-config
+  main-is: Main.hs
+  type:    exitcode-stdio-1.0
diff --git a/hydra-node/test/Hydra/JSONSchemaSpec.hs b/hydra-node/test/Hydra/JSONSchemaSpec.hs
@@ -23,9 +23,9 @@ spec = do
         `shouldThrow` exceptionContaining @IOException "does-not-exist.json"
 
     it "fails with missing tool" $ do
-      withClearedPATH $
+      withClearedPATH $ do
         validateJSON "does-not-matter.json" id Null
-          `shouldThrow` exceptionContaining @IOException "installed"
+          `shouldThrow` exceptionContaining @IOException ""
 
     it "selects a sub-schema correctly" $
       withJsonSpecifications $ \dir ->

diff --git a/hydra-node/test/Hydra/UtilsSpec.hs b/hydra-node/test/Hydra/UtilsSpec.hs
@@ -10,7 +10,7 @@ import Test.Hydra.Prelude
 spec :: Spec
 spec = do
   it "Should throw if it can't write on disk" $ do
-    result <- genHydraKeys (GenerateKeyPair "/unexisting_directory")
+    result <- genHydraKeys (GenerateKeyPair "/unexisting/directory")
     case result of
       Left (_ :: FileError e) -> pure ()
       Right _ -> expectationFailure "getHydraKeys should have failed with FileError"