Merge lp:~yolanda.robla/ubuntu/saucy/openldap/dep-8-tests into lp:ubuntu/saucy/openldap

[Yolanda Robla]

Added dep-8-tests
Recheck, reworked openldap tests to use static list, with UTF-8 chars

[Martin Pitt (pitti)]

> * d/tests: added dep-8-tests

Can you please describe why the existing files were removed, and which functional changes were done to debian/tests/hammer_slapd?

Also, please write "debian/tests", and "autopkgtest" instead of "dep-8-tests" (I did that in your other MPs).

Otherwise, the tests pass with "run-adt-test -sS lp:~yolanda.robla/ubuntu/saucy/openldap/dep-8-tests openldap".

Thanks!

review: Needs Fixing

[Yolanda Robla (yolanda.robla)]

I removed existing dict because the size was very huge. I created a custom dict with randon words, that included some UTF-8 chars in order to test that functionality also.

[lp:~yolanda.robla/ubuntu/saucy/openldap/dep-8-tests]

59. By Yolanda Robla on 2013-05-28

debian/tests: added autopkgtests

Unmerged revisions

59. By Yolanda Robla on 2013-05-28

debian/tests: added autopkgtests

58. By Yolanda Robla on 2013-05-21

added extra tests

57. By Yolanda Robla on 2013-05-21

d/tests: added dep-8-tests

56. By Yolanda Robla on 2013-05-02

added dep-8-tests

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-20 08:46:02 +0000
+++ debian/changelog	2013-05-28 15:23:25 +0000
@@ -1,3 +1,9 @@
+openldap (2.4.31-1ubuntu3) saucy; urgency=low
+
+  * debian/tests: added autopkgtests
+
+ -- Yolanda <[e-mail]>  Tue, 21 May 2013 18:31:24 +0200
+
 openldap (2.4.31-1ubuntu2) quantal-proposed; urgency=low
 
   * debian/slapd.py: Add AppArmor info and logs to apport hook.

=== modified file 'debian/control'
--- debian/control	2012-07-18 13:29:46 +0000
+++ debian/control	2013-05-28 15:23:25 +0000
@@ -22,6 +22,7 @@
 Homepage: http://www.openldap.org/
 Vcs-Svn: svn://svn.debian.org/pkg-openldap/openldap/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openldap/openldap/trunk
+XS-Testsuite: autopkgtest
 
 Package: slapd
 Section: net

=== removed file 'debian/tests/check_upgradepath'
--- debian/tests/check_upgradepath	2009-02-18 18:44:00 +0000
+++ debian/tests/check_upgradepath	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# WARNING: This script is obsolete and will require a fair bit of work to get
-# working again.  It assumes woody, uses debconf questions that don't exist
-# any more, and probably doesn't check everything that you would want to
-# check.  Preserved just because I haven't done the work to see if puiparts
-# can now do the same thing in a cleaner way.
-
-# Setup
-: ${chroot_dir:=../chroot}
-: ${debmirror:=http://ftp.de.debian.org/debian}
-: ${proxy:=http://proxy.galaxy:3128/}
-unset LC_ALL
-unset LC_CTYPE
-unset LC_MESSAGES
-# XXX: comment out when testing new versions. Needed so libc6 does not
-# ask for restarting services.
-export DEBIAN_FRONTEND=noninteractive
-
-woodytar=$chroot_dir/woody_base.tar.gz
-
-# List our packages
-list_packages() {
-	local p ver
-	ver=`dpkg-parsechangelog|sed -ne 's/^Version: //p'`
-	for p in `dh_listpackages`; do
-		(cd .. && echo ${p}_$ver*deb)
-	done
-}
-
-# Run a command inside the chroot
-
-in_target() {
-	chroot $chroot_dir/woody "$@"
-}
-
-# Set a debconf variable inside the chroot
-
-debconf_set() {
-	local name=$1
-	shift
-	cat >>$chroot_dir/woody/var/cache/debconf/config.dat <<EOF
-Name: $name
-Template: $name
-Flags: seen
-Value: $@
-
-EOF
-}
-
-# Setup a woody chroot
-
-setup_chroot() {
-	# Kill an existing chroot
-	rm -Rf $chroot_dir/woody
-
-	# If there is a tar archive with a base system we use it
-	if [ -e $woodytar ]; then
-		mkdir $chroot_dir/woody
-		echo -n "Unpacking system from $woodytar"
-		tar -C $chroot_dir/woody -xzf $woodytar
-		echo "done."
-	# Otherwise we need to create a new base system and save it
-	# to a tar for the next time
-	else
-		debootstrap woody $chroot_dir/woody $debmirror | \
-		  shtool prop -p "Creating base system from $debmirror"
-		tar -C $chroot_dir/woody -czvf $woodytar . | \
-			shtool prop -p "Saving system to $woodytar"
-	fi
-
-	# Install a suitable apt configuration
-	echo "deb $debmirror woody main" \
-		> $chroot_dir/woody/etc/apt/sources.list
-	echo "Acquire::HTTP::Proxy \"$proxy\";" \
-		> $chroot_dir/woody/etc/apt/apt.conf
-	in_target apt-get update
-	in_target mount -t proc none /proc
-
-	# We don't want any debconf interaction
-	#debconf_set debconf/frontend Noninteractive
-}
-
-# These are our example configurations for testing the upgrade
-
-conf_domain_or_host() {
-	debconf_set slapd/fill_method auto
-	debconf_set slapd/suffix_type "domain or host"
-	debconf_set slapd/domain "some.example.net"
-	debconf_set slapd/replicate false
-	debconf_set shared/organization Some Organization
-}
-
-
-check_domain_or_host() {
-	sleep 2  # wait for slapd to startup
-	in_target ldapsearch -h localhost -b dc=some,dc=example,dc=net -x \
-		objectclass=\*
-}
-
-conf_location() {
-	debconf_set slapd/fill_method auto
-	debconf_set slapd/suffix_type "location"
-	debconf_set shared/locale/countrycode de
-	debconf_set shared/organization "Sample Organization"
-	debconf_set slapd/replicate false
-	debconf_set shared/organization Some Organization
-}
-
-check_location() {
-	sleep 2  # wait for slapd to startup
-	in_target ldapsearch -h localhost -b "o=Some Organization, c=de" \
-		-x objectclass=\*
-}
-# Install slapd inside the chroot
-
-install_slapd() {
-	in_target apt-get -y install slapd ldap-utils
-}
-
-# Do an upgrade of our packages inside the chroot
-
-upgrade() {
-	# Link our packages into the chroot
-	for p in `list_packages`; do 
-		ln ../$p $chroot_dir/woody/root/
-	done
-
-	# Create a packages file
-	(cd $chroot_dir/woody/root && dpkg-scanpackages . /dev/null >Packages)
-
-	# Switch to unstable
-	echo "deb $debmirror unstable main" \
-		> $chroot_dir/woody/etc/apt/sources.list
-	echo "deb file:/root ./" >> $chroot_dir/woody/etc/apt/sources.list
-
-	# Update package lists
-	in_target apt-get update
-
-	# Tell our scripts to fix the config
-	debconf_set slapd/fix_directory true
-	debconf_set slapd/password1 foobar
-	debconf_set slapd/allow_ldap_v2
-
-	# Do an upgrade of our packages
-	in_target apt-get install -y `dh_listpackages`
-}
-
-# Checks if upgrading a woody system with slapd configured with the
-# command given works.
-
-check_upgrade() {
-	setup_chroot
-	conf_$1
-	debconf_set slapd/password1 foobar
-	debconf_set slapd/password2 foobar
-	install_slapd
-	check_$1
-	upgrade
-	check_$1
-	in_target /etc/init.d/slapd stop
-	in_target umount /proc
-}
-
-# Try upgrading our example setups
-
-for i in location domain_or_host; do
-	check_upgrade $i
-done
-
-echo "SUCCESS testing upgrading from woody"

=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-05-28 15:23:25 +0000
@@ -0,0 +1,3 @@
+Tests: slapd create_account hammer_slapd
+Depends:  libnet-ldap-perl
+Restrictions: needs-root

=== added directory 'debian/tests/dict'
=== added file 'debian/tests/dict/random_words'
--- debian/tests/dict/random_words	1970-01-01 00:00:00 +0000
+++ debian/tests/dict/random_words	2013-05-28 15:23:25 +0000
@@ -0,0 +1,25 @@
+Aarón
+Abraham
+África
+Alžběta
+Barney
+Blažej
+Bryce
+Christy
+Elise
+Gabriel
+Homer
+Kevin
+Mary
+Ramón
+Robin
+Susan
+Tom
+Will's
+Zen
+张
+芳
+Алиса
+Камилла
+Вадим
+Тимур

=== removed file 'debian/tests/find_unused_functions'
--- debian/tests/find_unused_functions	2009-02-18 18:44:00 +0000
+++ debian/tests/find_unused_functions	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#! /usr/bin/perl -w
-
-use autouse Data::Dumper, qw{Dumper};
-
-# Script to find the unused shell functions in slapd.scripts-common
-
-our @code;
-
-# Get all shell code from maintainer scripts
-
-foreach my $file ((<slapd.*rm>, <slapd.*inst>, <slapd.config>, 
-	<slapd.scripts-common>)) {
-	open SCRIPT, "<$file" or
-		die "Can't open $file: $!";
-	push @code, <SCRIPT>;
-	close SCRIPT;
-}
-
-# Find all function declarations
-
-our @functions = map { /^(\w+)\s*\(\).*$/;  } @code;
-
-# Find unused functions
-
-foreach $function (@functions) {
-	@occurences  = grep /$function/, @code;
-	@invocations = grep { !/^$function\s*\(\)/ and !/#.*$function/ }
-				@occurences;
-	print "$function\n" if @invocations == 0;
-}

=== modified file 'debian/tests/hammer_slapd'
--- debian/tests/hammer_slapd	2009-02-18 18:44:00 +0000
+++ debian/tests/hammer_slapd	2013-05-28 15:23:25 +0000
@@ -2,6 +2,7 @@
 
 use Net::LDAP;
 use Data::Dumper;
+use File::Basename;
 
 $host = "localhost";			# LDAP server
 $basedn = "dc=galaxy";			# Base DN
@@ -23,28 +24,19 @@
 	}
 }
 
-sub invent_name {
+sub invent_names {
+	our @names;
 	our @words;
 	unless (@words) {
-		open WORDS, "/usr/share/dict/british-english-large";
+		open WORDS, dirname(__FILE__)."/dict/random_words" or die "Can't open dictionary";
 		@words = grep /^[A-Z]\w{0,11}$/, <WORDS>;
 		map { chomp } @words;
 		close WORDS;
 	}
 
-	my $index = int(rand(@words));
-	$index = int(rand(@words)) while not defined $words[$index];
-	my $word = $words[$index];
-	delete $words[$index];
-	return $word;
-}
-
-sub invent_names {
-	our @names;
-
-	foreach (1..1000) {
-		push @names, { cn => invent_name, sn => invent_name };
-	}
+        foreach (@words) {
+            push @names, { cn => $_, sn => $_ };
+        }
 }
 
 sub create_entries {
@@ -61,11 +53,11 @@
 	my $login = $id{cn};
 	$login =~ tr/A-Z/a-z/;
 	$ldap->add("uid=$login, ou=$group, $basedn", attr => [
-		%id, 
-		objectClass => [ "top", "person", "posixAccount" ], 
+		%id,
+                objectClass => [ "top", "person", "posixAccount" ], 
 		uid => $login, 
 		uidNumber => $uid++, 
-		gidNumber => 1000, 
+		gidNumber => 1000,
 		homeDirectory => "/home/$login" ]);
 }
 
@@ -83,7 +75,7 @@
 }
 
 sub search_entries {
-	foreach (1..10000) {
+	foreach (1..1000) {
 		my $num = int(rand(@names));
 		$login = $names[$num]->{cn};
 		$login =~ tr/A-Z/a-z/;

=== added file 'debian/tests/slapd'
--- debian/tests/slapd	1970-01-01 00:00:00 +0000
+++ debian/tests/slapd	2013-05-28 15:23:25 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+#--------------
+# Testing slapd
+#--------------
+set -e
+
+debconf-set-selections <<< "slapd slapd/password1 password foo" 2>&1
+debconf-set-selections <<< "slapd slapd/internal/adminpw password foo" 2>&1
+debconf-set-selections <<< "slapd slapd/password2 password foo" 2>&1
+debconf-set-selections <<< "slapd slapd/domain string galaxy" 2>&1
+
+DEBIAN_FRONTEND=noninteractive aptitude install -q -y slapd 2>&1
+
+perl `dirname $0`/create_account 2>&1
+perl `dirname $0`/hammer_slapd 2>&1