Skip to content
Permalink
Browse files

Ensure local server tests can run on ubuntu, followup to 7b2640d

  • Loading branch information
dakcarto committed Feb 26, 2014
1 parent 7b2640d commit 2d21b674fa9597f481dea7e9dc1df1863a9f5438
@@ -79,7 +79,7 @@ def _run(self, cmd, env=None):
stdout=subprocess.PIPE,
env=env,
close_fds=True)
err = p.stderr.read()
err = p.communicate()[1]
if err:
if p:
p.kill()
@@ -218,13 +218,17 @@ def __init__(self, kind, exe, fcgi_bin, conf_dir, temp_dir):
init_scr = os.path.join(init_scr_dir,
'spawn_fcgi_debian.sh')
self.set_startcmd([
init_scr, 'start', exe, fcgi_sock, temp_dir])
init_scr, 'start', exe, fcgi_sock,
temp_dir + fcgi_bin, temp_dir])
self.set_stopcmd([
init_scr, 'stop', exe, fcgi_sock, temp_dir])
init_scr, 'stop', exe, fcgi_sock,
temp_dir + fcgi_bin, temp_dir])
self.set_restartcmd([
init_scr, 'restart', exe, fcgi_sock, temp_dir])
init_scr, 'restart', exe, fcgi_sock,
temp_dir + fcgi_bin, temp_dir])
self.set_statuscmd([
init_scr, 'status', exe, fcgi_sock, temp_dir])
init_scr, 'status', exe, fcgi_sock,
temp_dir + fcgi_bin, temp_dir])
elif dist == 'fedora' or dist == 'rhel':
pass
else: # win
@@ -122,7 +122,7 @@ def test_getmap(self):

chk = QgsRenderChecker()
chk.setControlName('expected_' + test_name)
chk.setMapRenderer(None)
# chk.setMapRenderer(None)
res = chk.compareImages(test_name, 0, str(img_path))
if QGIS_TEST_REPORT and not res: # don't report ok checks
TESTREPORTS[test_name] = str(chk.report().toLocal8Bit())
@@ -6,11 +6,11 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=$2
NAME=spawn-fcgi
DESC="$NAME"
TEMPDIR=$4
TEMPDIR=$5
FCGI=qgis_mapserv
PIDFILE=$TEMPDIR/var/$NAME.pid
FCGISOCKET=$3
FCGIBIN=$TEMPDIR/cgi-bin/$FCGI.fcgi
FCGIBIN=$4
SCRIPTNAME=$NAME


@@ -46,8 +46,8 @@ case "$1" in
fi
;;
restart)
$0 stop $2 $3 $4
$0 start $2 $3 $4
$0 stop $2 $3 $4 $5
$0 start $2 $3 $4 $5
;;
status)
status_of_proc -p "$PIDFILE" "$DAEMON" spawn-fcgi && exit 0 || exit $?

0 comments on commit 2d21b67

Please sign in to comment.
You can’t perform that action at this time.