[debian-edu-commits] debian-edu/ 01/01: Extend testsuite/taskpkgs to also check that the correct desktop task was activated.

[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 8a0a688d348ad180306f3836cd1535484c1dff25
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 26 11:18:33 2014 +0200

    Extend testsuite/taskpkgs to also check that the correct desktop task was activated.
---
 debian/changelog   |  7 ++++++-
 testsuite/taskpkgs | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9539e9b..cdf1693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-debian-edu-config (1.806) UNRELEASED; urgency=high
+debian-edu-config (1.806) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * sbin/debian-edu-pxeinstall: replace d-i version 7.0 with 8.0 to fix
     pxe installations.
 
+  [ Petter Reinholdtsen ]
+  * Extend testsuite/taskpkgs to also check that the correct desktop
+    task was activated.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 25 Sep 2014 23:56:27 +0200
 
 debian-edu-config (1.805) unstable; urgency=high
diff --git a/testsuite/taskpkgs b/testsuite/taskpkgs
index e11c553..2ed7a95 100755
--- a/testsuite/taskpkgs
+++ b/testsuite/taskpkgs
@@ -42,6 +42,18 @@ if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
 
+# Check if the desktop type selection worked
+check_desktop_task() {
+    desktop=$(debconf-show tasksel |tr -d "*" |awk '/tasksel\/desktop/ {print $2}')
+    pkg="education-desktop-$desktop"
+    if deb_installed "$pkg" ; then
+	echo "success: $0: Desktop package $pkg is installed."
+    else
+	echo "error: $0: Desktop package $pkg is not installed."
+    fi
+}
+
+
 retval=0
 
 check_installed education-common
@@ -51,15 +63,19 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
     case $value in
 	Standalone)
 	    check_installed_task education-standalone
+	    check_desktop_task
 	    ;;
 	Workstation)
 	    check_installed_task education-workstation
+	    check_desktop_task
 	    ;;
 	Roaming-Workstation)
 	    check_installed_task education-roaming-workstation
+	    check_desktop_task
 	    ;;
 	Thin-Client-Server|LTSP-server)
 	    check_installed_task education-thin-client-server
+	    check_desktop_task
 	    ;;
 	Main-Server|Server)
 	    check_installed_task education-main-server

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