Skip to content

Instantly share code, notes, and snippets.

@egroeper
Created March 29, 2016 19:57
Show Gist options
  • Save egroeper/9a1c2414607a9ac70674a783f0ca8995 to your computer and use it in GitHub Desktop.
Save egroeper/9a1c2414607a9ac70674a783f0ca8995 to your computer and use it in GitHub Desktop.
diff --git a/tests/seahubtests.sh b/tests/seahubtests.sh
index 9fa1d21..0d05a8a 100755
--- a/tests/seahubtests.sh
+++ b/tests/seahubtests.sh
@@ -26,6 +26,8 @@ fi
set -x
SEAHUB_TESTSDIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
SEAHUB_SRCDIR=$(dirname "${SEAHUB_TESTSDIR}")
+# include CONFIG VARIABLES
+. $SEAHUB_SRCDIR/setenv.sh
local_settings_py=${SEAHUB_SRCDIR}/seahub/local_settings.py
export PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}"
@@ -39,9 +41,9 @@ function init() {
$PYTHON ./manage.py syncdb
# create normal user
- $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True); ccnet_
+ $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}', central_config_dir='${SEAFILE_CENTRAL_CONF_DIR}'); ccnet_threaded_rpc = ccnet.C
# create admin
- $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True); ccnet_
+ $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}', central_config_dir='${SEAFILE_CENTRAL_CONF_DIR}'); ccnet_threaded_rpc = ccnet.C
# enlarge anon api throttling settings in settings.py, this is a workaround
# to make tests pass, otherwise a few tests will be throttlled.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment