digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Rename callCommandQuiet -> callCommandsilent for consistency with callProcessSilent* (#5376)

Browse Source 
changelog_begin
changelog_end
This commit is contained in:
nickchapman-da 2020-04-02 15:51:10 +01:00 committed by GitHub
parent e3ff700a67
commit 0599ef53db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
daml-assistant/integration-tests/src/DA/Daml/Assistant/IntegrationTests.hs
View File

@ -37,7 +37,7 @@ import DA.Bazel.Runfiles
import DA.Daml.Assistant.FreePort (getFreePort,socketHints) import DA.Daml.Assistant.FreePort (getFreePort,socketHints)
import DA.Daml.Helper.Run (waitForHttpServer,waitForConnectionOnPort) import DA.Daml.Helper.Run (waitForHttpServer,waitForConnectionOnPort)
import DA.Test.Daml2TsUtils (writeRootPackageJson) import DA.Test.Daml2TsUtils (writeRootPackageJson)
import DA.Test.Process (callCommandQuiet,callProcessSilent) import DA.Test.Process (callCommandSilent,callProcessSilent)
import DA.Test.Util import DA.Test.Util
import SdkVersion import SdkVersion
@ -65,9 +65,9 @@ main = do
tests :: FilePath -> FilePath -> TestTree tests :: FilePath -> FilePath -> TestTree
tests tmpDir damlTypesDir = withSdkResource $ \_ -> testGroup "Integration tests" tests tmpDir damlTypesDir = withSdkResource $ \_ -> testGroup "Integration tests"
[ testCase "daml version" $ callCommandQuiet "daml version" [ testCase "daml version" $ callCommandSilent "daml version"
, testCase "daml --help" $ callCommandQuiet "daml --help" , testCase "daml --help" $ callCommandSilent "daml --help"
, testCase "daml new --list" $ callCommandQuiet "daml new --list" , testCase "daml new --list" $ callCommandSilent "daml new --list"
, packagingTests , packagingTests
, quickstartTests quickstartDir mvnDir , quickstartTests quickstartDir mvnDir
, cleanTests cleanDir , cleanTests cleanDir
@ -99,7 +99,7 @@ withSdkResource f =
then callProcessSilent then callProcessSilent
(extractDir </> "daml" </> damlInstallerName) (extractDir </> "daml" </> damlInstallerName)
["install", "--install-assistant=yes", "--set-path=no", extractDir] ["install", "--install-assistant=yes", "--set-path=no", extractDir]
else callCommandQuiet $ extractDir </> "install.sh" else callCommandSilent $ extractDir </> "install.sh"
setEnv "PATH" (intercalate [searchPathSeparator] ((targetDir </> "bin") : oldPath)) True setEnv "PATH" (intercalate [searchPathSeparator] ((targetDir </> "bin") : oldPath)) True
pure oldPath pure oldPath
restoreEnv oldPath = do restoreEnv oldPath = do
@ -117,14 +117,14 @@ packagingTests :: TestTree
packagingTests = testGroup "packaging" packagingTests = testGroup "packaging"
[ testCase "Build copy trigger" $ withTempDir $ \tmpDir -> do [ testCase "Build copy trigger" $ withTempDir $ \tmpDir -> do
let projDir = tmpDir </> "copy-trigger" let projDir = tmpDir </> "copy-trigger"
callCommandQuiet $ unwords ["daml", "new", projDir, "copy-trigger"] callCommandSilent $ unwords ["daml", "new", projDir, "copy-trigger"]
withCurrentDirectory projDir $ callCommandQuiet "daml build" withCurrentDirectory projDir $ callCommandSilent "daml build"
let dar = projDir </> ".daml" </> "dist" </> "copy-trigger-0.0.1.dar" let dar = projDir </> ".daml" </> "dist" </> "copy-trigger-0.0.1.dar"
assertBool "copy-trigger-0.1.0.dar was not created." =<< doesFileExist dar assertBool "copy-trigger-0.1.0.dar was not created." =<< doesFileExist dar
, testCase "Build copy trigger with LF version 1.dev" $ withTempDir $ \tmpDir -> do , testCase "Build copy trigger with LF version 1.dev" $ withTempDir $ \tmpDir -> do
let projDir = tmpDir </> "copy-trigger" let projDir = tmpDir </> "copy-trigger"
callCommandQuiet $ unwords ["daml", "new", projDir, "copy-trigger"] callCommandSilent $ unwords ["daml", "new", projDir, "copy-trigger"]
withCurrentDirectory projDir $ callCommandQuiet "daml build --target 1.dev" withCurrentDirectory projDir $ callCommandSilent "daml build --target 1.dev"
let dar = projDir </> ".daml" </> "dist" </> "copy-trigger-0.0.1.dar" let dar = projDir </> ".daml" </> "dist" </> "copy-trigger-0.0.1.dar"
assertBool "copy-trigger-0.1.0.dar was not created." =<< doesFileExist dar assertBool "copy-trigger-0.1.0.dar was not created." =<< doesFileExist dar
, testCase "Build trigger with extra dependency" $ withTempDir $ \tmpDir -> do , testCase "Build trigger with extra dependency" $ withTempDir $ \tmpDir -> do
@ -143,7 +143,7 @@ packagingTests = testGroup "packaging"
[ "daml 1.2" [ "daml 1.2"
, "module MyDep where" , "module MyDep where"
] ]
withCurrentDirectory myDepDir $ callCommandQuiet "daml build -o mydep.dar" withCurrentDirectory myDepDir $ callCommandSilent "daml build -o mydep.dar"
let myTriggerDir = tmpDir </> "mytrigger" let myTriggerDir = tmpDir </> "mytrigger"
createDirectoryIfMissing True (myTriggerDir </> "daml") createDirectoryIfMissing True (myTriggerDir </> "daml")
writeFileUTF8 (myTriggerDir </> "daml.yaml") $ unlines writeFileUTF8 (myTriggerDir </> "daml.yaml") $ unlines
@ -163,24 +163,24 @@ packagingTests = testGroup "packaging"
, "import MyDep ()" , "import MyDep ()"
, "import Daml.Trigger ()" , "import Daml.Trigger ()"
] ]
withCurrentDirectory myTriggerDir $ callCommandQuiet "daml build -o mytrigger.dar" withCurrentDirectory myTriggerDir $ callCommandSilent "daml build -o mytrigger.dar"
let dar = myTriggerDir </> "mytrigger.dar" let dar = myTriggerDir </> "mytrigger.dar"
assertBool "mytrigger.dar was not created." =<< doesFileExist dar assertBool "mytrigger.dar was not created." =<< doesFileExist dar
, testCase "Build DAML script example" $ withTempDir $ \tmpDir -> do , testCase "Build DAML script example" $ withTempDir $ \tmpDir -> do
let projDir = tmpDir </> "script-example" let projDir = tmpDir </> "script-example"
callCommandQuiet $ unwords ["daml", "new", projDir, "script-example"] callCommandSilent $ unwords ["daml", "new", projDir, "script-example"]
withCurrentDirectory projDir $ callCommandQuiet "daml build" withCurrentDirectory projDir $ callCommandSilent "daml build"
let dar = projDir </> ".daml/dist/script-example-0.0.1.dar" let dar = projDir </> ".daml/dist/script-example-0.0.1.dar"
assertBool "script-example-0.0.1.dar was not created." =<< doesFileExist dar assertBool "script-example-0.0.1.dar was not created." =<< doesFileExist dar
, testCase "Build DAML script example with LF version 1.dev" $ withTempDir $ \tmpDir -> do , testCase "Build DAML script example with LF version 1.dev" $ withTempDir $ \tmpDir -> do
let projDir = tmpDir </> "script-example" let projDir = tmpDir </> "script-example"
callCommandQuiet $ unwords ["daml", "new", projDir, "script-example"] callCommandSilent $ unwords ["daml", "new", projDir, "script-example"]
withCurrentDirectory projDir $ callCommandQuiet "daml build --target 1.dev" withCurrentDirectory projDir $ callCommandSilent "daml build --target 1.dev"
let dar = projDir </> ".daml/dist/script-example-0.0.1.dar" let dar = projDir </> ".daml/dist/script-example-0.0.1.dar"
assertBool "script-example-0.0.1.dar was not created." =<< doesFileExist dar assertBool "script-example-0.0.1.dar was not created." =<< doesFileExist dar
, testCase "Package depending on daml-script and daml-trigger can use data-dependencies" $ withTempDir $ \tmpDir -> do , testCase "Package depending on daml-script and daml-trigger can use data-dependencies" $ withTempDir $ \tmpDir -> do
callCommandQuiet $ unwords ["daml", "new", tmpDir </> "data-dependency"] callCommandSilent $ unwords ["daml", "new", tmpDir </> "data-dependency"]
withCurrentDirectory (tmpDir </> "data-dependency") $ callCommandQuiet "daml build -o data-dependency.dar" withCurrentDirectory (tmpDir </> "data-dependency") $ callCommandSilent "daml build -o data-dependency.dar"
createDirectoryIfMissing True (tmpDir </> "proj") createDirectoryIfMissing True (tmpDir </> "proj")
writeFileUTF8 (tmpDir </> "proj" </> "daml.yaml") $ unlines writeFileUTF8 (tmpDir </> "proj" </> "daml.yaml") $ unlines
[ "sdk-version: " <> sdkVersion [ "sdk-version: " <> sdkVersion
@ -195,7 +195,7 @@ packagingTests = testGroup "packaging"
, "import Main (setup)" , "import Main (setup)"
, "setup' = setup" , "setup' = setup"
] ]
withCurrentDirectory (tmpDir </> "proj") $ callCommandQuiet "daml build" withCurrentDirectory (tmpDir </> "proj") $ callCommandSilent "daml build"
, testCase "Run init-script" $ withTempDir $ \tmpDir -> do , testCase "Run init-script" $ withTempDir $ \tmpDir -> do
let projDir = tmpDir </> "init-script-example" let projDir = tmpDir </> "init-script-example"
createDirectoryIfMissing True (projDir </> "daml") createDirectoryIfMissing True (projDir </> "daml")
@ -327,15 +327,15 @@ packagingTests = testGroup "packaging"
quickstartTests :: FilePath -> FilePath -> TestTree quickstartTests :: FilePath -> FilePath -> TestTree
quickstartTests quickstartDir mvnDir = testGroup "quickstart" quickstartTests quickstartDir mvnDir = testGroup "quickstart"
[ testCase "daml new" $ [ testCase "daml new" $
callCommandQuiet $ unwords ["daml", "new", quickstartDir, "quickstart-java"] callCommandSilent $ unwords ["daml", "new", quickstartDir, "quickstart-java"]
, testCase "daml build" $ withCurrentDirectory quickstartDir $ , testCase "daml build" $ withCurrentDirectory quickstartDir $
callCommandQuiet "daml build" callCommandSilent "daml build"
, testCase "daml test" $ withCurrentDirectory quickstartDir $ , testCase "daml test" $ withCurrentDirectory quickstartDir $
callCommandQuiet "daml test" callCommandSilent "daml test"
, testCase "daml damlc test --files" $ withCurrentDirectory quickstartDir $ , testCase "daml damlc test --files" $ withCurrentDirectory quickstartDir $
callCommandQuiet "daml damlc test --files daml/Main.daml" callCommandSilent "daml damlc test --files daml/Main.daml"
, testCase "daml damlc visual-web" $ withCurrentDirectory quickstartDir $ , testCase "daml damlc visual-web" $ withCurrentDirectory quickstartDir $
callCommandQuiet $ unwords ["daml damlc visual-web .daml/dist/quickstart-0.0.1.dar -o visual.html -b"] callCommandSilent $ unwords ["daml damlc visual-web .daml/dist/quickstart-0.0.1.dar -o visual.html -b"]
, testCase "Sandbox startup" $ , testCase "Sandbox startup" $
withCurrentDirectory quickstartDir $ withCurrentDirectory quickstartDir $
withDevNull $ \devNull -> do withDevNull $ \devNull -> do
@ -431,7 +431,7 @@ quickstartTests quickstartDir mvnDir = testGroup "quickstart"
withCreateProcess sandboxProc $ withCreateProcess sandboxProc $
\_ _ _ ph -> race_ (waitForProcess' sandboxProc ph) $ do \_ _ _ ph -> race_ (waitForProcess' sandboxProc ph) $ do
waitForConnectionOnPort (threadDelay 500000) sandboxPort waitForConnectionOnPort (threadDelay 500000) sandboxPort
callCommandQuiet $ unwords callCommandSilent $ unwords
[ "daml script" [ "daml script"
, "--dar .daml/dist/quickstart-0.0.1.dar" , "--dar .daml/dist/quickstart-0.0.1.dar"
, "--script-name Setup:initialize" , "--script-name Setup:initialize"
@ -474,11 +474,11 @@ cleanTests baseDir = testGroup "daml clean"
createDirectoryIfMissing True baseDir createDirectoryIfMissing True baseDir
withCurrentDirectory baseDir $ do withCurrentDirectory baseDir $ do
let projectDir = baseDir </> ("proj-" <> templateName) let projectDir = baseDir </> ("proj-" <> templateName)
callCommandQuiet $ unwords ["daml", "new", projectDir, templateName] callCommandSilent $ unwords ["daml", "new", projectDir, templateName]
withCurrentDirectory projectDir $ do withCurrentDirectory projectDir $ do
filesAtStart <- sort <$> listFilesRecursive "." filesAtStart <- sort <$> listFilesRecursive "."
callCommandQuiet "daml build" callCommandSilent "daml build"
callCommandQuiet "daml clean" callCommandSilent "daml clean"
filesAtEnd <- sort <$> listFilesRecursive "." filesAtEnd <- sort <$> listFilesRecursive "."
when (filesAtStart /= filesAtEnd) $ when (filesAtStart /= filesAtEnd) $
fail $ unlines fail $ unlines
@ -494,8 +494,8 @@ templateTests :: TestTree
templateTests = testGroup "templates" templateTests = testGroup "templates"
[ testCase name $ do [ testCase name $ do
withTempDir $ \dir -> withCurrentDirectory dir $ do withTempDir $ \dir -> withCurrentDirectory dir $ do
callCommandQuiet $ unwords ["daml", "new", "foobar", name] callCommandSilent $ unwords ["daml", "new", "foobar", name]
withCurrentDirectory (dir </> "foobar") $ callCommandQuiet "daml build" withCurrentDirectory (dir </> "foobar") $ callCommandSilent "daml build"
| name <- templateNames | name <- templateNames
] ]
@ -531,9 +531,9 @@ codegenTests codegenDir damlTypes = testGroup "daml codegen" (
createDirectoryIfMissing True codegenDir createDirectoryIfMissing True codegenDir
withCurrentDirectory codegenDir $ do withCurrentDirectory codegenDir $ do
let projectDir = codegenDir </> ("proj-" ++ lang) let projectDir = codegenDir </> ("proj-" ++ lang)
callCommandQuiet $ unwords ["daml new", projectDir, "skeleton"] callCommandSilent $ unwords ["daml new", projectDir, "skeleton"]
withCurrentDirectory projectDir $ do withCurrentDirectory projectDir $ do
callCommandQuiet "daml build" callCommandSilent "daml build"
let darFile = projectDir </> ".daml/dist/proj-" ++ lang ++ "-0.0.1.dar" let darFile = projectDir </> ".daml/dist/proj-" ++ lang ++ "-0.0.1.dar"
outDir = projectDir </> "generated" </> lang outDir = projectDir </> "generated" </> lang
when (lang == "ts") $ do when (lang == "ts") $ do
@ -544,7 +544,7 @@ codegenTests codegenDir damlTypes = testGroup "daml codegen" (
withCurrentDirectory "generated" $ do withCurrentDirectory "generated" $ do
copyDirectory damlTypes "daml-types" copyDirectory damlTypes "daml-types"
writeRootPackageJson Nothing [lang] writeRootPackageJson Nothing [lang]
callCommandQuiet $ callCommandSilent $
unwords [ "daml", "codegen", lang unwords [ "daml", "codegen", lang
, darFile ++ maybe "" ("=" ++) namespace , darFile ++ maybe "" ("=" ++) namespace
, "-o", outDir] , "-o", outDir]

6
libs-haskell/test-utils/DA/Test/Process.hs
View File

@ -6,7 +6,7 @@ module DA.Test.Process
, callProcessSilent , callProcessSilent
, callProcessSilentError , callProcessSilentError
, callProcessForStdout , callProcessForStdout
, callCommandQuiet , callCommandSilent
) where ) where
import Control.Monad (unless,void) import Control.Monad (unless,void)
@ -28,8 +28,8 @@ callProcessForStdout :: FilePath -> [String] -> IO String
callProcessForStdout cmd args = callProcessForStdout cmd args =
run (ShouldSucceed True) (proc cmd args) run (ShouldSucceed True) (proc cmd args)
callCommandQuiet :: String -> IO () callCommandSilent :: String -> IO ()
callCommandQuiet cmd = callCommandSilent cmd =
void $ run (ShouldSucceed True) (shell cmd) void $ run (ShouldSucceed True) (shell cmd)
run :: ShouldSucceed -> CreateProcess -> IO String run :: ShouldSucceed -> CreateProcess -> IO String