Merge pull request #27430 from owncloud/inttest-masterkey-fixes

Master key tweaks for integration tests

tests/integration/Makefile

@@ -6,5 +6,8 @@ clean:
 
 .PHONY: test
 test:
-	OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED) ./run.sh
+	OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) \
+	OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED) \
+	OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED=$(OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED) \
+	./run.sh
 

tests/integration/features/external-storage.feature

@@ -3,6 +3,7 @@ Feature: external-storage
     Given using api version "1"
     Given using old dav path
 
+  # TODO: change to @no_default_encryption once all this works with master key
   @local_storage
   @no_encryption
   Scenario: Share by link a file inside a local external storage

tests/integration/features/transfer-ownership.feature

 Feature: transfer-ownership
 
+	# TODO: change to @no_default_encryption once all this works with master key
 	@no_encryption
 	Scenario: transfering ownership of a file
 		Given user "user0" exists
@@ -114,12 +115,14 @@ Feature: transfer-ownership
 		When transfering ownership from "user0" to "user1"
 		Then the command was successful
 
+	@no_encryption
 	Scenario: transfering ownership fails with invalid source user
 		Given user "user0" exists
 		When transfering ownership from "invalid_user" to "user0"
 		Then the command error output contains the text "Unknown source user"
 		And the command failed with exit code 1
 
+	@no_encryption
 	Scenario: transfering ownership fails with invalid target user
 		Given user "user0" exists
 		When transfering ownership from "user0" to "invalid_user"
@@ -221,6 +224,7 @@ Feature: transfer-ownership
 		And using received transfer folder of "user1" as dav path
 		Then as "user1" the folder "/local_storage" does not exist
 
+	@no_encryption
 	Scenario: transfering ownership fails with invalid source user
 		Given user "user0" exists
 		And User "user0" created a folder "/sub"
@@ -228,6 +232,7 @@ Feature: transfer-ownership
 		Then the command error output contains the text "Unknown source user"
 		And the command failed with exit code 1
 
+	@no_encryption
 	Scenario: transfering ownership fails with invalid target user
 		Given user "user0" exists
 		And User "user0" created a folder "/sub"
@@ -235,6 +240,7 @@ Feature: transfer-ownership
 		Then the command error output contains the text "Unknown target user"
 		And the command failed with exit code 1
 
+	@no_encryption
 	Scenario: transfering ownership fails with invalid path
 		Given user "user0" exists
 		And user "user1" exists

tests/integration/run.sh

@@ -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"
+	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"
+	BEHAT_FILTER_TAGS="~@no_encryption ~@no_masterkey_encryption"
 fi
 
 if test "$BEHAT_FILTER_TAGS"; then