Commit 7f7cdecb authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #13741 from owncloud/autotest_improvements

Better config cleanup in autotest.sh
parents 799e144b 5acbeb96
......@@ -109,3 +109,5 @@ Vagrantfile
/tests/autotest*
/tests/data/lorem-copy.txt
/tests/data/testimage-copy.png
/config/config-autotest-backup.php
/config/autoconfig.php
......@@ -60,20 +60,25 @@ if [ "$1" ]; then
fi
fi
# Back up existing (dev) config if one exists
if [ -f config/config.php ]; then
# Back up existing (dev) config if one exists and backup not already there
if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then
mv config/config.php config/config-autotest-backup.php
fi
function restore_config {
function cleanup_config {
cd "$BASEDIR"
# Restore existing config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi
# Remove autotest config
if [ -f config/autoconfig.php ]; then
rm config/autoconfig.php
fi
}
# restore config on exit, even when killed
trap restore_config SIGINT SIGTERM
# restore config on exit
trap cleanup_config EXIT
# use tmpfs for datadir - should speedup unit test execution
if [ -d /dev/shm ]; then
......@@ -278,9 +283,6 @@ else
execute_tests "$1" "$2"
fi
cd "$BASEDIR"
restore_config
#
# NOTES on mysql:
# - CREATE DATABASE oc_autotest;
......
......@@ -66,20 +66,25 @@ if [ "$1" ]; then
fi
fi
# Back up existing (dev) config if one exists
if [ -f config/config.php ]; then
# Back up existing (dev) config if one exists and backup not already there
if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then
mv config/config.php config/config-autotest-backup.php
fi
function restore_config {
function cleanup_config {
cd "$BASEDIR"
# Restore existing config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi
# Remove autotest config
if [ -f config/autoconfig.php ]; then
rm config/autoconfig.php
fi
}
# restore config on exit, even when killed
trap restore_config SIGINT SIGTERM
# restore config on exit
trap cleanup_config EXIT
# use tmpfs for datadir - should speedup unit test execution
if [ -d /dev/shm ]; then
......@@ -236,9 +241,6 @@ else
execute_tests "$1" "$2" "$3"
fi
cd "$BASEDIR"
restore_config
#
# NOTES on mysql:
# - CREATE DATABASE oc_autotest;
......
......@@ -60,20 +60,25 @@ if [ "$1" ]; then
fi
fi
# Back up existing (dev) config if one exists
if [ -f config/config.php ]; then
# Back up existing (dev) config if one exists and backup not already there
if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then
mv config/config.php config/config-autotest-backup.php
fi
function restore_config {
function cleanup_config {
cd "$BASEDIR"
# Restore existing config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi
# Remove autotest config
if [ -f config/autoconfig.php ]; then
rm config/autoconfig.php
fi
}
# restore config on exit, even when killed
trap restore_config SIGINT SIGTERM
# restore config on exit
trap cleanup_config EXIT
# use tmpfs for datadir - should speedup unit test execution
if [ -d /dev/shm ]; then
......@@ -234,9 +239,6 @@ else
execute_tests "$1" "$FILENAME" "$3"
fi
cd "$BASEDIR"
restore_config
#
# NOTES on mysql:
# - CREATE DATABASE oc_autotest;
......
Supports Markdown
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