From: Roland Mas <lolando@debian.org>
Date: Tue, 26 Feb 2013 10:55:47 +0000 (+0100)
Subject: Better integration of nscd in the testsuite
X-Git-Tag: v5.2.2~52
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=ddaa4e3840a1eb2ee52325da46c6b10ea12b0a49

Better integration of nscd in the testsuite
---

diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index 5dd60d56b5..33eebdf611 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -98,3 +98,12 @@ then
 else
 	service httpd start
 fi
+
+echo "Flushing/restarting nscd"
+rm -f /var/cache/nscd/* || true
+if type invoke-rc.d 2>/dev/null
+then
+    invoke-rc.d nscd restart || true
+else
+    service nscd restart || true
+fi
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index bc4cf49087..101fe098ff 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -99,7 +99,7 @@ ssh root@$HOST "LANG=C a2dissite default ; LANG=C invoke-rc.d apache2 reload"
 ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
-ssh root@$HOST "service nscd stop"
+ssh root@$HOST "service nscd restart"
 
 # Dump database
 echo "Dump freshly installed database"