Skip to content

[stable10] Integration test run.sh must fail on error #30683

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

Merged
phil-davis merged 2 commits into from
Mar 3, 2018
Merged

[stable10] Integration test run.sh must fail on error #30683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237f5e8
Integration test run.sh must fail on error
Feb 27, 2018
eaadec1
Tidy error messages in acceptance tests run.sh
phil-davis Mar 2, 2018
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
16 changes: 8 additions & 8 deletions tests/acceptance/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function env_alt_home_enable {
}

function env_alt_home_clear {
$OCC app:disable testing
$OCC app:disable testing || { echo "Unable to disable testing app" >&2; exit 1; }
}

function env_encryption_enable {
Expand All @@ -29,12 +29,12 @@ function env_encryption_enable {
}

function env_encryption_enable_master_key {
env_encryption_enable
env_encryption_enable || { echo "Unable to enable masterkey encryption" >&2; exit 1; }
$OCC encryption:select-encryption-type masterkey --yes
}

function env_encryption_enable_user_keys {
env_encryption_enable
env_encryption_enable || { echo "Unable to enable user-keys encryption" >&2; exit 1; }
$OCC encryption:select-encryption-type user-keys --yes
}

Expand All @@ -44,12 +44,12 @@ function env_encryption_disable {
}

function env_encryption_disable_master_key {
env_encryption_disable
env_encryption_disable || { echo "Unable to disable masterkey encryption" >&2; exit 1; }
$OCC config:app:delete encryption useMasterKey
}

function env_encryption_disable_users_key {
env_encryption_disable
function env_encryption_disable_user_keys {
env_encryption_disable || { echo "Unable to disable user-keys encryption" >&2; exit 1; }
$OCC config:app:delete encryption userSpecificKey
}

Expand Down Expand Up @@ -83,7 +83,7 @@ $OCC config:system:set files_external_allow_create_new_local --value=true
PREVIOUS_TESTING_APP_STATUS=$($OCC --no-warnings app:list "^testing$")
if [[ "$PREVIOUS_TESTING_APP_STATUS" =~ ^Disabled: ]]
then
$OCC app:enable testing
$OCC app:enable testing || { echo "Unable to enable testing app" >&2; exit 1; }
TESTING_ENABLED_BY_SCRIPT=true;
else
TESTING_ENABLED_BY_SCRIPT=false;
Expand Down Expand Up @@ -170,7 +170,7 @@ if test "$OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED" = "1"; then
fi

if test "$OC_TEST_ENCRYPTION_USER_KEYS_ENABLED" = "1"; then
env_encryption_disable_users_key
env_encryption_disable_user_keys
fi

if [ -z $HIDE_OC_LOGS ]; then
Expand Down