[debian-edu-commits] r81453 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-07 17:59:12 +0000 (Sun, 07 Jul 2013)
New Revision: 81453

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/webserver
Log:
Correct webserver test suite, only check file permissions of
profiles.ini on the Main Server where it exist.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 14:01:40 UTC (rev 81452)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 17:59:12 UTC (rev 81453)
@@ -1,3 +1,11 @@
+debian-edu-config (1.709~svn81437) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Correct webserver test suite, only check file permissions of
+    profiles.ini on the Main Server where it exist.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Jul 2013 19:58:25 +0200
+
 debian-edu-config (1.709~svn81436) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/testsuite/webserver
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/webserver	2013-07-07 14:01:40 UTC (rev 81452)
+++ branches/wheezy/debian-edu-config/testsuite/webserver	2013-07-07 17:59:12 UTC (rev 81453)
@@ -27,8 +27,6 @@
     echo "success: $0: Found $overridefile."
 fi
 
-check_file_perm /etc/skel/.mozilla/firefox/profiles.ini 644
-
 # Only Main-Server profile provide webserver
 if echo "$PROFILE" | grep -q 'Main-Server' ; then
     :
@@ -36,6 +34,9 @@
     exit 0
 fi
 
+# Only Main-Server have the debian-edu profile in the firefox setup.
+check_file_perm /etc/skel/.mozilla/firefox/profiles.ini 644
+
 server=www
 
 # Wait for 10 seconds