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

Merge pull request #26846 from owncloud/tests-md5-homedir

Enable testing env for alternative home folder formats
parents 0e87521b 2fc9276d
......@@ -126,7 +126,16 @@ timestampedNode('SLAVE') {
make test-integration
'''
}
}
executeAndReport('build/integration/output/*.xml') {
sh '''phpenv local 7.0
rm -rf config/config.php
./occ maintenance:install --admin-pass=admin
make clean-test-integration
make test-integration OC_TEST_ALT_HOME=1
'''
}
}
}
def isOnReleaseBranch () {
......
......@@ -152,7 +152,7 @@ test-js: $(nodejs_deps) $(js_deps) $(core_vendor)
.PHONY: test-integration
test-integration: $(composer_dev_deps)
$(MAKE) -C build/integration
$(MAKE) -C build/integration OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME)
.PHONY: test-php-lint
test-php-lint: $(composer_dev_deps)
......
......@@ -22,5 +22,5 @@ clean-test-results:
clean: clean-test-results clean-composer-deps
test: install-composer-deps
./run.sh
OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) ./run.sh
......@@ -8,6 +8,15 @@ OCC=${OC_PATH}occ
SCENARIO_TO_RUN=$1
HIDE_OC_LOGS=$2
function env_alt_home_enable {
$OCC app:enable testing
$OCC config:app:set testing enable_alt_user_backend --value yes
}
function env_alt_home_clear {
$OCC app:disable testing
}
# avoid port collision on jenkins - use $EXECUTOR_NUMBER
if [ -z "$EXECUTOR_NUMBER" ]; then
EXECUTOR_NUMBER=0
......@@ -37,6 +46,10 @@ ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
$OCC files_external:option $ID_STORAGE enable_sharing true
if test "$OC_TEST_ALT_HOME" = "1"; then
env_althome_enable
fi
vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
RESULT=$?
......@@ -48,6 +61,10 @@ $OCC files_external:delete -y $ID_STORAGE
#Disable external storage app
$OCC app:disable files_external
if test "$OC_TEST_ALT_HOME" = "1"; then
env_althome_clear
fi
if [ -z $HIDE_OC_LOGS ]; then
tail "${OC_PATH}/data/owncloud.log"
fi
......
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