Mercurial > kallithea
view init.d/kallithea-daemon-redhat @ 7277:0cf121eae2fe
tests: fix caching issue in test_ip_restriction_git
Following test failure is observed in
TestVCSOperations.test_ip_restriction_git:
―――――――――――――― TestVCSOperations.test_ip_restriction_git ――――――――――――――――――
kallithea/tests/other/test_vcs_operations.py:584: in test_ip_restriction_git
assert re.search(r'\b403\b', stderr)
E assert None
E + where None = <function search at 0x7fb9772da578>('\\b403\\b', "Cloning into '/tmp/kallithea-test-SZhXDz/vcs_operations-krPNvZ'...\n")
E + where <function search at 0x7fb9772da578> = re.search
------------------------- Captured stdout call ----------------------------
*** CMD git clone http://test_admin:test12@127.0.0.1:45291/vcs_test_git /tmp/kallithea-test-SZhXDz/vcs_operations-krPNvZ ***
stderr: "Cloning into '/tmp/kallithea-test-SZhXDz/vcs_operations-krPNvZ'...\n"
The test is setting up IP restrictions, verifying that access is no longer
possible, then clears the restriction. There already were sleeps after
clearing the restrictions, in order for the cache to expire and have the
setting take effect.
But there was no sleep on the enabling of the IP restriction, allowing
situations where the code would still run without restriction, and thus
allow the access, failing the test.
The failure has only been observed on test_ip_restriction_git, but the
change is also made for test_ip_restriction_hg.
The existing sleeps after restriction clearing are moved up to the 'finally'
clause to make it clear to which code they belong.
author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
---|---|
date | Sun, 06 May 2018 21:30:09 +0200 |
parents | 2c3d30095d5e |
children | 71bdbf129190 |
line wrap: on
line source
#!/bin/sh ######################################## #### THIS IS A REDHAT INIT.D SCRIPT #### ######################################## ################################################## # # Kallithea server startup script # Recommended default-startup: 2 3 4 5 # Recommended default-stop: 0 1 6 # ################################################## APP_NAME="kallithea" # the location of your app # since this is a web app, it should go in /var/www APP_PATH="/var/www/$APP_NAME" CONF_NAME="production.ini" # write to wherever the PID should be stored, just ensure # that the user you run gearbox as has the appropriate permissions # same goes for the log file PID_PATH="/var/run/kallithea/pid" LOG_PATH="/var/log/kallithea/kallithea.log" # replace this with the path to the virtual environment you # made for Kallithea PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv" RUN_AS="kallithea" DAEMON="$PYTHON_PATH/bin/gearbox" DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME" DESC="kallithea-server" LOCK_FILE="/var/lock/subsys/$APP_NAME" # source CentOS init functions . /etc/init.d/functions RETVAL=0 remove_pid () { rm -f ${PID_PATH} rmdir `dirname ${PID_PATH}` } ensure_pid_dir () { PID_DIR=`dirname ${PID_PATH}` if [ ! -d ${PID_DIR} ] ; then mkdir -p ${PID_DIR} chown -R ${RUN_AS}:${RUN_AS} ${PID_DIR} chmod 755 ${PID_DIR} fi } start_kallithea () { ensure_pid_dir PYTHON_EGG_CACHE="/tmp" daemon --pidfile $PID_PATH \ --user $RUN_AS "$DAEMON $DAEMON_OPTS" RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCK_FILE return $RETVAL } stop_kallithea () { if [ -e $LOCK_FILE ]; then killproc -p $PID_PATH RETVAL=$? rm -f $LOCK_FILE rm -f $PID_PATH else RETVAL=1 fi return $RETVAL } status_kallithea() { if [ -e $LOCK_FILE ]; then # exit with non-zero to indicate failure RETVAL=1 else RETVAL=0 fi return $RETVAL } restart_kallithea () { stop_kallithea start_kallithea RETVAL=$? } case "$1" in start) echo -n $"Starting $DESC: " start_kallithea echo ;; stop) echo -n $"Stopping $DESC: " stop_kallithea echo ;; status) status_kallithea RETVAL=$? if [ ! $RETVAL -eq 0 ]; then echo "Kallithea server is running..." else echo "Kallithea server is stopped." fi ;; restart) echo -n $"Restarting $DESC: " restart_kallithea echo ;; *) echo $"Usage: $0 {start|stop|restart|status}" RETVAL=1 ;; esac exit $RETVAL