Move credential deployment tests to consensus test suite.

Concordium · Nov 13, 2023 · 1131cc4 · 1131cc4
1 parent 6ccab7f
commit 1131cc4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 625 deletions.
diff --git a/concordium-consensus/package.yaml b/concordium-consensus/package.yaml
@@ -331,40 +331,6 @@ tests:
     - template-haskell
     - temporary >= 1.3
 
-  e2e:
-    main:                Spec.hs
-    source-dirs:         tests/e2e
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    - -Wall
-    - -Wcompat
-    - -fno-ignore-asserts
-    - -Wno-deprecations
-    when:
-      - condition: os(windows)
-        then:
-          ghc-options: -static
-        else:
-          when:
-            - condition: flag(dynamic)
-              then:
-                ghc-options: -dynamic
-              else:
-                ghc-options: -static
-    dependencies:
-    - concordium-consensus
-    - hspec >= 2.6
-    - QuickCheck >= 2.12
-    - hspec-expectations >= 0.8
-    - containers
-    - time >= 1.8
-    - random >= 1.1
-    - HUnit >= 1.6
-    - temporary >= 1.3
-    - monad-loops
-
 benchmarks:
   trie:
     main:                TrieBench.hs

diff --git a/concordium-consensus/tests/consensus/Spec.hs b/concordium-consensus/tests/consensus/Spec.hs
@@ -7,6 +7,7 @@ import qualified ConcordiumTests.Afgjort.Freeze (tests)
 import qualified ConcordiumTests.Afgjort.Lottery (tests)
 import qualified ConcordiumTests.Afgjort.Types (tests)
 import qualified ConcordiumTests.Afgjort.WMVBA (tests)
+import qualified ConcordiumTests.EndToEnd.CredentialDeploymentTests (tests)
 import qualified ConcordiumTests.FinalizationRecover (test)
 import qualified ConcordiumTests.KonsensusV1.CatchUp (tests)
 import qualified ConcordiumTests.KonsensusV1.Consensus (tests)
@@ -63,3 +64,4 @@ main = atLevel $ \lvl -> hspec $ do
     ConcordiumTests.KonsensusV1.Timeout.tests
     ConcordiumTests.KonsensusV1.Consensus.Blocks.tests
     ConcordiumTests.KonsensusV1.CatchUp.tests
+    ConcordiumTests.EndToEnd.CredentialDeploymentTests.tests lvl
diff --git a/concordium-consensus/tests/e2e/EndToEndTests/CredentialDeploymentTests.hs b/concordium-consensus/tests/e2e/EndToEndTests/CredentialDeploymentTests.hs