Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Haskell tests to Sandbox on X #12761

Merged
merged 2 commits into from
Feb 7, 2022
Merged

Migrate Haskell tests to Sandbox on X #12761

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed63075
Migrate Haskell tests to Sandbox on X
cocreature Feb 4, 2022
951c9b0
.
cocreature Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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
  • Loading branch information
@cocreature
cocreature committed Feb 7, 2022
commit ed63075b36e722bcfc3a2a7b63501bf35697d3cf
6 changes: 3 additions & 3 deletions compiler/damlc/tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions daml-assistant/daml-helper/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion language-support/hs/bindings/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs-haskell/test-utils/DA/Test/Sandbox.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down