Commit d17a83ea authored by Vincent Petry's avatar Vincent Petry Committed by GitHub
Browse files

Merge pull request #27462 from owncloud/behat-fix-encryption-filter

Properly filter out encryption tests
parents 745a12e6 df02efbb
......@@ -83,10 +83,10 @@ fi
# Enable encryption if requested
if test "$OC_TEST_ENCRYPTION_ENABLED" = "1"; then
env_encryption_enable
BEHAT_FILTER_TAGS="~@no_encryption ~@no_default_encryption"
BEHAT_FILTER_TAGS="~@no_encryption&&~@no_default_encryption"
elif test "$OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED" = "1"; then
env_encryption_enable_master_key
BEHAT_FILTER_TAGS="~@no_encryption ~@no_masterkey_encryption"
BEHAT_FILTER_TAGS="~@no_encryption&&~@no_masterkey_encryption"
fi
if test "$BEHAT_FILTER_TAGS"; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment