[debian-edu-commits] debian-edu/ 01/01: Improve testsuite/timezone.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository debian-edu-config.

commit 7e8a276d06380582942a2c4f874ae7780665b47d
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 5 10:44:51 2014 +0200

    Improve testsuite/timezone.
    
    * Make testsuite/timezone more predictable by sorting list of possible
      time zones.
    * Adjust testsuite/timezone to accept Europe/Oslo and Arctic/Longyearbyen
      as timezones in Norway, to match values used in Wheezy and Jessie.
---
 debian/changelog   | 4 ++++
 testsuite/timezone | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb75618..1c3500b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ debian-edu-config (1.725) UNRELEASED; urgency=low
   [ Petter Reinholdtsen ]
   * Extend testsuite/ldap-client to check if the local users is present
     in LDAP.
+  * Make testsuite/timezone more predictable by sorting list of possible
+    time zones.
+  * Adjust testsuite/timezone to accept Europe/Oslo and Arctic/Longyearbyen
+    as timezones in Norway, to match values used in Wheezy and Jessie.
 
   [ Mike Gabriel ]
   * Fix wrong parameter name (loglevel -> log level) in the main server's
diff --git a/testsuite/timezone b/testsuite/timezone
index 29c15aa..18d548f 100755
--- a/testsuite/timezone
+++ b/testsuite/timezone
@@ -19,7 +19,7 @@ fi
 
 # Find the matching zonefile(s)
 id=$(md5sum /etc/localtime | awk '{print $1}')
-curzones=$(cd /usr/share/zoneinfo; find . -type f |xargs md5sum | grep $id |awk '{print $2}' | sed 's/\.\///')
+curzones=$(cd /usr/share/zoneinfo; find . -type f |xargs md5sum | grep $id |awk '{print $2}' | sed 's/\.\///' | sort)
 
 map_locale_to_timezone() {
     case "$1" in
@@ -64,7 +64,7 @@ map_locale_to_timezone() {
 	    localzone="posix/Europe/Amsterdam"
 	    ;;
 	*_NO*)
-	    localzone="posix/Atlantic/Jan_Mayen"
+	    localzone="Europe/Oslo posix/Atlantic/Jan_Mayen Arctic/Longyearbyen"
 	    ;;
 	*_PL*)
 	    localzone="posix/Europe/Warsaw"

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