Update quickstart-java test for new sandbox. (#5339)

changelog_begin
changelog_end
This commit is contained in:
associahedron 2020-04-01 16:27:52 +01:00 committed by GitHub
parent 5cfe296253
commit 2714927130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -428,10 +428,18 @@ quickstartTests quickstartDir mvnDir = testGroup "quickstart"
withDevNull $ \devNull1 ->
withDevNull $ \devNull2 -> do
sandboxPort :: Int <- fromIntegral <$> getFreePort
let sandboxProc = (shell $ unwords ["daml", "sandbox-classic", "--", "--port", show sandboxPort, "--", "--static-time", "--scenario", "Main:setup", ".daml/dist/quickstart-0.0.1.dar"]) { std_out = UseHandle devNull1, std_in = CreatePipe }
let sandboxProc = (shell $ unwords ["daml", "sandbox", "--", "--port", show sandboxPort, "--", "--static-time", ".daml/dist/quickstart-0.0.1.dar"]) { std_out = UseHandle devNull1, std_in = CreatePipe }
withCreateProcess sandboxProc $
\_ _ _ ph -> race_ (waitForProcess' sandboxProc ph) $ do
waitForConnectionOnPort (threadDelay 500000) sandboxPort
callCommandQuiet $ unwords
[ "daml script"
, "--dar .daml/dist/quickstart-0.0.1.dar"
, "--script-name Setup:initialize"
, "--static-time"
, "--ledger-host localhost"
, "--ledger-port", show sandboxPort
]
restPort :: Int <- fromIntegral <$> getFreePort
let mavenProc = (shell $ unwords ["mvn", mvnRepoFlag, "-Dledgerport=" <> show sandboxPort, "-Drestport=" <> show restPort, "exec:java@run-quickstart"]) { std_out = UseHandle devNull2 }
withCreateProcess mavenProc $