Fix cloud tests by using correct config from the repo (#11223)

- Part of #11220
enso-org · Oct 2, 2024 · a23b669 · a23b669
1 parent ad53c82
commit a23b669
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/extra-nightly-tests.yml b/.github/workflows/extra-nightly-tests.yml
@@ -105,9 +105,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: ./run backend test standard-library
         env:
-          ENSO_CLOUD_COGNITO_REGION: ${{ secrets.ENSO_CLOUD_COGNITO_REGION }}
-          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ secrets.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
-          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ secrets.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
+          ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
+          ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
+          ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
           ENSO_CLOUD_TEST_ACCOUNT_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
           ENSO_CLOUD_TEST_ACCOUNT_USERNAME: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
           ENSO_LIB_S3_AWS_ACCESS_KEY_ID: ${{ secrets.ENSO_LIB_S3_AWS_ACCESS_KEY_ID }}

diff --git a/build/build/src/ci_gen/job.rs b/build/build/src/ci_gen/job.rs
@@ -212,15 +212,15 @@ impl JobArchetype for JvmTests {
 }
 
 fn enable_cloud_tests(step: Step) -> Step {
-    step.with_secret_exposed_as(
+    step.with_variable_exposed_as(
         secret::ENSO_CLOUD_COGNITO_USER_POOL_ID,
         crate::cloud_tests::env::ci_config::ENSO_CLOUD_COGNITO_USER_POOL_ID,
     )
-    .with_secret_exposed_as(
+    .with_variable_exposed_as(
         secret::ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID,
         crate::cloud_tests::env::ci_config::ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID,
     )
-    .with_secret_exposed_as(
+    .with_variable_exposed_as(
         secret::ENSO_CLOUD_COGNITO_REGION,
         crate::cloud_tests::env::ci_config::ENSO_CLOUD_COGNITO_REGION,
     )

diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso b/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso
@@ -177,7 +177,7 @@ add_specs suite_builder setup:Cloud_Tests_Setup = suite_builder.group "Enso Clou
         Context.Output.with_disabled <|
             r = "ABC".write f
             r.should_fail_with Forbidden_Operation
-            r.catch.to_display_text . should_contain "Currently dry-run is not supported for Enso_File"
+            r.catch.to_display_text . should_contain "As writing is disabled, no action has been performed"
         # The file should not have been created
         f.exists . should_be_false
 

diff --git a/test/Base_Tests/src/System/File_Spec.enso b/test/Base_Tests/src/System/File_Spec.enso
@@ -387,7 +387,7 @@ add_specs suite_builder =
 
         cloud_setup = Cloud_Tests_Setup.prepare
         with_temporary_cloud_root ~action =
-            subdir = (Enso_File.root / ("my_test_CWD-" + Random.uuid.take 5)).create_directory
+            subdir = (Enso_File.home / ("my_test_CWD-" + Random.uuid.take 5)).create_directory
             subdir.should_succeed
             cleanup =
                 Enso_User.flush_caches

diff --git a/test/Table_Tests/src/IO/Cloud_Spec.enso b/test/Table_Tests/src/IO/Cloud_Spec.enso
@@ -21,7 +21,7 @@ add_specs suite_builder =
         group_builder.specify "writing Excel" <|
             t = Table.new [["X", [1, 2, 3]], ["Y", ["a", "b", "c"]]]
 
-            f = Enso_File.root / ("write-test-"+Temporary_Directory.timestamp_text+".xlsx")
+            f = Enso_File.home / ("write-test-"+Temporary_Directory.timestamp_text+".xlsx")
             t.write f . should_equal f
             Panic.with_finalizer f.delete_if_exists <|
                 workbook = f.read