digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 08:48:21 +03:00
Code Issues Projects Releases Wiki Activity

Migrate Haskell tests to Sandbox on X (#12761)

Browse Source 
* Migrate Haskell tests to Sandbox on X

The diff here looks extremely confusing. sandbox-classic is now
sandbox on x not sandbox classic so this isn’t a typo. It is really
moving to sandbox on x.

changelog_begin
changelog_end

* .

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2022-02-07 21:18:16 +01:00 committed by GitHub
parent c9dcd1c493
commit 22165730bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/damlc/tests/BUILD.bazel
View File

@ -609,7 +609,7 @@ da_haskell_test(
":repl-test.dar",
"//compiler/damlc",
"//daml-script/daml:daml-script.dar",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
"//ledger/test-common/test-certificates",
],
hackage_deps = [
@ -652,7 +652,7 @@ da_haskell_test(
"//compiler/damlc/stable-packages",
"//compiler/repl-service/server:repl_service_jar",
"//daml-script/daml:daml-script.dar",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
hackage_deps = [
"async",
@ -912,7 +912,7 @@ da_haskell_test(
data = [
":pkg-manager-test.dar",
"//compiler/damlc",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
hackage_deps = [
"base",

8
daml-assistant/daml-helper/BUILD.bazel
View File

@ -94,7 +94,7 @@ da_haskell_test(
srcs = ["test/DA/Daml/Helper/Test/Tls.hs"],
data = [
"daml-helper",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
"//ledger/test-common/test-certificates",
],
hackage_deps = [
@ -120,7 +120,7 @@ da_haskell_test(
data = [
"//compiler/damlc",
"//daml-assistant/daml-helper",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
# TODO (MK) https://github.com/digital-asset/daml/issues/9768
flaky = True,
@ -162,7 +162,7 @@ da_haskell_test(
"daml-helper",
":test.dar",
"//ledger-service/http-json:http-json-binary",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
hackage_deps = [
"base",
@ -196,7 +196,7 @@ da_haskell_test(
"daml-helper",
":test.dar",
"//ledger-service/http-json:http-json-binary",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
hackage_deps = [
"base",

2
language-support/hs/bindings/BUILD.bazel
View File

@ -51,7 +51,7 @@ da_haskell_test(
data = [
":for-tests.dar",
":for-upload.dar",
"//ledger/sandbox:sandbox-binary",
"//ledger/sandbox-classic:sandbox-classic-binary",
],
# The tests throw flaky timeout errors. It looks like this comes
# from a fundamental issue in the Haskell bindings: they eagerly pull

2
language-support/hs/bindings/test/DA/Ledger/Tests.hs
View File

@ -327,7 +327,7 @@ tGetLedgerConfiguration withSandbox = testCase "tGetLedgerConfiguration" $ run w
xs <- getLedgerConfiguration lid
Just (Right config) <- liftIO $ timeout 1 (takeStream xs)
let expected = LedgerConfiguration {
maxDeduplicationTime = Duration {durationSeconds = 86400, durationNanos = 0}}
maxDeduplicationTime = Duration {durationSeconds = 1800, durationNanos = 0}}
liftIO $ assertEqual "config" expected config
tUploadDarFileBad :: SandboxTest

2
libs-haskell/test-utils/DA/Test/Sandbox.hs
View File

@ -57,7 +57,7 @@ defaultSandboxConf = SandboxConfig
getSandboxProc :: SandboxConfig -> FilePath -> IO CreateProcess
getSandboxProc SandboxConfig{..} portFile = do
sandbox <- locateRunfiles (mainWorkspace </> "ledger" </> "sandbox" </> exe "sandbox-binary")
sandbox <- locateRunfiles (mainWorkspace </> "ledger" </> "sandbox-classic" </> exe "sandbox-classic-binary")
tlsArgs <- if enableTls
then do
certDir <- locateRunfiles (mainWorkspace </> "ledger" </> "test-common" </> "test-certificates")