[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Adjust testsuite/{cups, dnsd, ldap-client, ntp, samba}

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
70a4e044 by Wolfgang Schweer at 2021-01-01T12:14:51+01:00
Adjust testsuite/{cups,dnsd,ldap-client,ntp,samba}

This reflects the recent changes to the related services

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


6 changed files:

- debian/changelog
- testsuite/cups
- testsuite/dnsd
- testsuite/ldap-client
- testsuite/ntp
- testsuite/samba


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
 debian-edu-config (2.11.42) UNRELEASED; urgency=medium
 
   * sbin/debian-edu-pxeinstall: Use the Homeworld theme also for syslinux.
+  * Adjust testsuite/{cups,dnsd,ldap-client,ntp,samba} to reflect recent changes
+    to related services.
   * Drop CUPS related workaround now that bug #977198 has been fixed:
     - Remove share/debian-edu-config/cups.service.
     - Adjust Makefile and cf3/cf.workarounds.


=====================================
testsuite/cups
=====================================
@@ -34,7 +34,7 @@ unset https_proxy || true
 unset ftp_proxy  || true
 
 # CUPS only listens on port 631 on central ipp host, not localhost.
-for url in "https://ipp:631/" ; do
+for url in "https://ipp.intern:631/" ; do
     if wget -O - $WGETOPTS $url > /dev/null 2>&1 ; then
 	echo "success: $0: URL '$url' is working."
     else


=====================================
testsuite/dnsd
=====================================
@@ -105,6 +105,7 @@ for cname in \
     kerberos \
     postoffice \
     domain \
+    ipp \
   ; do
     if host -t cname "$cname" "$dnsserver" | grep -q SRV ; then
         echo "error: $0: Failed to find CNAME record for $cname on server $dnsserver"


=====================================
testsuite/ldap-client
=====================================
@@ -168,14 +168,7 @@ else
     error "Not only one PAM module of krb5, ldap and sss is enabled"
 fi
 
-# Make sure winbind isn't installed
-if deb_installed winbind ; then
-    error "winbind is installed"
-else
-    success "winbind is not installed"
-fi
-
-# Make sure winbind PAM module isn't active either
+# Make sure winbind PAM module isn't active
 if grep -q pam_winbind.so /etc/pam.d/common-auth; then
     error "winbind PAM module is active"
 else


=====================================
testsuite/ntp
=====================================
@@ -13,12 +13,6 @@ else
     exit 0
 fi
 
-if dash -n /etc/default/ntpdate ; then
-    :
-else
-    echo error: script error in /etc/default/ntpdate.
-fi
-
 if [ ! -x /usr/bin/ntpq ] ; then
     echo "error: $0: The ntpq binary is missing."
     exit 1
@@ -35,17 +29,3 @@ fi
 curservers=`ntpq -c lpeers | tail -n +3 | awk '{print $1}' |tr "\n" " "`
 
 echo "info: $0: Current NTP servers: '$curservers'."
-
-##
-## with r73294 and r73295 Debian Edu main server uses 
-## Debian's default values for NTP servers in ntpd.conf 
-## again, so dropping this test
-##
-#
-#if echo $PROFILE | grep -q 'Main-Server' ; then
-#    if echo $curservers | grep -q 'LOCAL(0)' ; then
-#	echo "success: $0: Found local NTP clock on server."
-#    else
-#	echo "error: $0: Missing local NTP clock on server."
-#    fi
-#fi


=====================================
testsuite/samba
=====================================
@@ -4,7 +4,6 @@
 
 . /usr/share/debian-edu-config/testsuite-lib.sh
 
-ADMINUSER=smbadmin
 DOMAIN=SKOLELINUX
 
 if test -r /etc/debian-edu/config ; then
@@ -18,22 +17,6 @@ else
     exit 0
 fi
 
-if /usr/bin/ldapsearch -LLL -x \
-    "(&(cn=$ADMINUSER)(objectClass=simpleSecurityObject))" \
-    >/dev/null 2>&1 ; then
-    echo "success: $0: smbadmin simpleSecurityObject exists in ldap"
-else
-    echo "error: $0: smbadmin simpleSecurityObject does not exists in ldap"
-fi
-
-if /usr/bin/ldapsearch -LLL -x \
-    "(&(objectclass=sambadomain)(sambadomainname=$DOMAIN))" \
-    > /dev/null 2>&1 ; then
-    echo "success: $0: sambadomain object for domain $DOMAIN exists in ldap"
-else
-    echo "error: $0: sambadomain object for domain $DOMAIN does not exists in ldap"
-fi
-
 # Only test if samba is installed
 if  deb_installed samba ; then
     :
@@ -54,17 +37,6 @@ netstat_check netbios-ssn tcp "Netbios session"
 
 if which net >/dev/null 2>&1 ; then
     echo "success: $0: found net binary."
-    if net groupmap list | grep -q '^Domain Admins ' ; then
-	echo "success: $0: found Domain Admins in samba groupmap."
-    else
-	echo "error: $0: missing Domain Admins in samba groupmap."
-    fi
-    if net maxrid 2>&1 | grep -q '^Currently ' ; then
-	echo "success: $0: maxrid is reported."
-    else
-	echo "error: $0: samba fails to report maxrid."
-    fi
-    exec 2>/dev/null
     if net time 2>&1 | grep -q $(date +%Y) ; then
 	echo "success: $0: command 'net time' is working."
     else



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/70a4e044a9d322414dcebe6c0c78122bf4577ad8

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/70a4e044a9d322414dcebe6c0c78122bf4577ad8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210101/463c62db/attachment-0001.html>