[debian-edu-commits] debian-edu/ 01/01: Fix testsuite/samba to actually report success if 'net time' is working.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Sun Aug 21 22:28:52 UTC 2016


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

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

commit 93aaf566d438fd5ff27fe571f44d0034217900a6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Aug 22 00:28:20 2016 +0200

    Fix testsuite/samba to actually report success if 'net time' is working.
---
 debian/changelog | 1 +
 testsuite/samba  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 01bf186..2957788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debian-edu-config (1.909) UNRELEASED; urgency=medium
     using systemctl don't work any longer inside the Debian-Installer target.
   * ldap-bootstrap/sudo.ldif: Replace tjener with tjener.intern cause sudoHost
     now needs the FQDN as value for sudo-ldap to work.
+  * Fix testsuite/samba to actually report success if 'net time' is working.
 
  -- Holger Levsen <holger at debian.org>  Fri, 19 Aug 2016 12:46:37 +0200
 
diff --git a/testsuite/samba b/testsuite/samba
index 5d4536b..31e78ba 100755
--- a/testsuite/samba
+++ b/testsuite/samba
@@ -65,7 +65,7 @@ if which net >/dev/null 2>&1 ; then
 	echo "error: $0: samba fails to report maxrid."
     fi
     exec 2>/dev/null
-    if net time 2>&1 | grep -q null ; then
+    if net time 2>&1 | grep -q $(date +%Y) ; then
 	echo "success: $0: command 'net time' doesn't segfault."
     else
 	echo "error: $0: command 'net time' segfaults (bug #760781)."

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



More information about the debian-edu-commits mailing list