Unverified Commit e558602b authored by Vincent Petry's avatar Vincent Petry
Browse files

Add integration test stage with encryption enabled

parent 1f7167a9
......@@ -135,6 +135,22 @@ timestampedNode('SLAVE') {
make test-integration OC_TEST_ALT_HOME=1
'''
}
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_ENCRYPTION_ENABLED=1
'''
}
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 OC_TEST_ENCRYPTION_ENABLED=1
'''
}
}
}
......
......@@ -152,7 +152,7 @@ test-js: $(nodejs_deps) $(js_deps) $(core_vendor)
.PHONY: test-integration
test-integration: $(composer_dev_deps)
$(MAKE) -C build/integration OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME)
$(MAKE) -C build/integration OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED)
.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
OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) ./run.sh
OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED) ./run.sh
......@@ -17,6 +17,16 @@ function env_alt_home_clear {
$OCC app:disable testing
}
function env_encryption_enable {
$OCC app:enable encryption
$OCC encryption:enable
}
function env_encryption_disable {
$OCC encryption:disable
$OCC app:disable encryption
}
# avoid port collision on jenkins - use $EXECUTOR_NUMBER
if [ -z "$EXECUTOR_NUMBER" ]; then
EXECUTOR_NUMBER=0
......@@ -50,6 +60,11 @@ if test "$OC_TEST_ALT_HOME" = "1"; then
env_alt_home_enable
fi
# Enable encryption if requested
if test "$OC_TEST_ENCRYPTION_ENABLED" = "1"; then
env_encryption_enable
fi
vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
RESULT=$?
......@@ -65,6 +80,11 @@ if test "$OC_TEST_ALT_HOME" = "1"; then
env_alt_home_clear
fi
# Disable encryption if requested
if test "$OC_TEST_ENCRYPTION_ENABLED" = "1"; then
env_encryption_disable
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