From 8cae19342d59a690c6c4a1fc68ca817761945694 Mon Sep 17 00:00:00 2001 From: Jose Nogueira Date: Fri, 5 Jul 2024 10:56:12 +0000 Subject: [PATCH] Revert "fix stat check in tests" This reverts commit e4001ecdbbd0a5a9c4a58010aa9cb695520eaae9. --- .ocamlformat | 3 ++- tests/create_command.t | 3 ++- tests/refresh_command.t | 2 +- tests/replace_command.t | 4 ++-- tests/setup_fixtures.sh | 11 ----------- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index fe088d1..f176b24 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,4 +1,4 @@ -version=0.26.2 +version=0.24.1 profile=default ocaml-version=4.14.0 @@ -17,3 +17,4 @@ nested-match=align # deprecated parens-ite=true parens-tuple=multi-line-only type-decl=sparse + diff --git a/tests/create_command.t b/tests/create_command.t index fdc15dc..59ebcd2 100644 --- a/tests/create_command.t +++ b/tests/create_command.t @@ -25,8 +25,9 @@ Should succeed - create a secret in a new folder, with info about recipients add If the secret is a staging secret, its only recipient should be @everyone. + Newly created secrets should have permissions 0o644 - $ check_permissions $PASSAGE_DIR/secrets/new/secret.age + $ stat -c "%a" $PASSAGE_DIR/secrets/new/secret.age 644 Should succeed - handle secrets with comments too diff --git a/tests/refresh_command.t b/tests/refresh_command.t index e6e7175..d14fca1 100644 --- a/tests/refresh_command.t +++ b/tests/refresh_command.t @@ -28,7 +28,7 @@ Should show individual operations on secrets when -v is passed I: refreshed 6 secrets, skipped 4, failed 0 Refreshed secrets should have the same permissions as before (0o644) - $ check_permissions $PASSAGE_DIR/secrets/test_secret.age + $ stat -c "%a" $PASSAGE_DIR/secrets/test_secret.age 644 Secret content should be the same before and after refresh. diff --git a/tests/replace_command.t b/tests/replace_command.t index 41e7e3e..0dd8780 100644 --- a/tests/replace_command.t +++ b/tests/replace_command.t @@ -22,9 +22,9 @@ Should succeed - replace a secret that does not yet exist in a folder where we a new secret line 3\123\65 Newly created secrets should have permissions 0o644 - $ check_permissions $PASSAGE_DIR/secrets/00/new_secret_singleline.age + $ stat -c "%a" $PASSAGE_DIR/secrets/00/new_secret_singleline.age 644 - $ check_permissions $PASSAGE_DIR/secrets/00/new_secret_multiline.age + $ stat -c "%a" $PASSAGE_DIR/secrets/00/new_secret_multiline.age 644 Should fail - replace a secret that does not yet exist in a folder where we are NOT listed on the .keys (invariant) diff --git a/tests/setup_fixtures.sh b/tests/setup_fixtures.sh index 894474b..b38031b 100644 --- a/tests/setup_fixtures.sh +++ b/tests/setup_fixtures.sh @@ -120,17 +120,6 @@ setup_multiline_secret_with_comments() { EOF } -check_permissions() { - if [[ "$OSTYPE" == "linux-gnu"* ]]; then - stat -c "%a" $1 - elif [[ "$OSTYPE" == "darwin"* ]]; then - stat -f "%A" $1 - else - echo "Unsupported OS" - exit 1 - fi -} - # $PASSAGE_DIR/secrets/ # ├── .keys # ├── 00