[debian-edu-commits] debian-edu/ 03/04: Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch h01ger/jessie-proposed
in repository debian-edu-config.

commit 3710c3239d53d3e0a0b51b799670d7fac7d4f24f
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Jul 20 15:19:10 2016 +0200

    Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.
    
    (cherry picked from commit 8758c19cd2f3b95e8ce96913ce2c309d575ed473)
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 testsuite/ltsp      |  5 ++---
 testsuite/webserver | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/testsuite/ltsp b/testsuite/ltsp
index 6c5c54d..502e739 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -58,12 +58,11 @@ if echo "$PROFILE" | grep -q Thin-Client-Server ; then
         error "Missing $chroot/etc/debian-edu/config"
     fi
 
-    for path in /etc/ldap/ssl/ldap-server-pubkey.pem \
-	/etc/firefox-esr/profile/cert_override.txt ; do
+    for path in /etc/ldap/ssl/ldap-server-pubkey.pem ; do
 	if cmp -s $path  $chroot$path ; then
 	    success "$path is identical inside and outside LTSP"
 	else
-	    error "$path differ inside and outside LTSP"
+	    error "$path is different inside and outside LTSP"
 	fi
     done
 
diff --git a/testsuite/webserver b/testsuite/webserver
index 4bfa489..45bd1f6 100755
--- a/testsuite/webserver
+++ b/testsuite/webserver
@@ -16,15 +16,14 @@ else
 fi
 
 skeloverride=/etc/skel/.mozilla/firefox/debian-edu.default/cert_override.txt
-if [ -e "$skeloverride" ] && [ -h "$skeloverride" ] ; then
-    echo "error: $0: Found symlink in $skeloverride."
-fi
-
-overridefile=/etc/firefox-esr/profile/cert_override.txt
-if [ ! -f "$overridefile" ] ; then
-    echo "error: $0: Missing $overridefile."
+if [ ! -f "$skeloverride" ] ; then
+    echo "error: $0: Missing $skeloverride."
 else
-    echo "success: $0: Found $overridefile."
+    if [ -h "$skeloverride" ] ; then
+        echo "error: $0: Found $skeloverride as symlink."
+    else
+        echo "success: $0: Found $skeloverride."
+    fi
 fi
 
 # Only Main-Server profile provide webserver

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git