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

[Yolanda Robla]

Added dep-8 tests

[lp:~yolanda.robla/amavisd-new/dep-8-tests]

35. By Yolanda Robla on 2013-05-02

fixing control

36. By Yolanda Robla on 2013-05-02

fixing control

37. By Yolanda Robla on 2013-05-10

d/tests: added dep-8-tests

Unmerged revisions

37. By Yolanda Robla on 2013-05-10

d/tests: added dep-8-tests

36. By Yolanda Robla on 2013-05-02

fixing control

35. By Yolanda Robla on 2013-05-02

fixing control

34. By Yolanda Robla on 2013-04-26

adding dep-8 tests

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-21 10:23:40 +0000
+++ debian/changelog	2013-05-10 15:36:24 +0000
@@ -1,3 +1,9 @@
+amavisd-new (1:2.7.1-2ubuntu4) saucy; urgency=low
+
+  * d/tests: added dep-8-tests
+
+ -- Yolanda <[e-mail]>  Fri, 10 May 2013 17:33:02 +0200
+
 amavisd-new (1:2.7.1-2ubuntu3) quantal; urgency=low
 
   * debian/control: drop altermime and ripole to Suggests after discussions
 
=== modified file 'debian/control'
--- debian/control	2012-09-21 10:23:40 +0000
+++ debian/control	2013-05-10 15:36:24 +0000
@@ -8,6 +8,7 @@
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=amavisd-new/pkg-amavisd-new.git;a=summary
 Vcs-Git: git://anonscm.debian.org/amavisd-new/pkg-amavisd-new.git
+XS-Testsuite: autopkgtest
 
 Package: amavisd-new
 Architecture: all
 
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-05-10 15:36:24 +0000
@@ -0,0 +1,3 @@
+Tests: hostandport smtpdaemon
+Depends: netcat, postfix, amavisd-new
+Restrictions: needs-root
 
=== added file 'debian/tests/hostandport'
--- debian/tests/hostandport	1970-01-01 00:00:00 +0000
+++ debian/tests/hostandport	2013-05-10 15:36:24 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+#------------------------------
+# Testing amavisd host and port
+#------------------------------
+MACHINE=127.0.0.1
+PORT=10024
+
+# modify hostname from amavis
+hostname localhost
+/etc/init.d/amavis restart >/dev/null 2>&1
+
+netcat -z ${MACHINE} ${PORT}
+if [ $? -eq 0 ]
+then
+	echo "OK"
+        exit 0
+else
+        echo "ERROR: amavisd-new not listening" >&1
+        exit 1
+fi
 
=== added file 'debian/tests/smtpdaemon'
--- debian/tests/smtpdaemon	1970-01-01 00:00:00 +0000
+++ debian/tests/smtpdaemon	2013-05-10 15:36:24 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash
+#-------------------------------
+# Testing the new Postfix daemon
+#-------------------------------
+MACHINE=127.0.0.1
+PORT=10025
+
+# modify hostname from amavis
+hostname localhost
+/etc/init.d/amavis restart >/dev/null 2>&1
+
+apt-get install -y amavisd-new-postfix >/dev/null 2>&1
+#/etc/init.d/postfix restart >/dev/null 2>&1
+
+netcat -z ${MACHINE} ${PORT}
+if [ $? -eq 0 ]
+then
+	echo "OK"
+        exit 0
+else
+        echo "ERROR: smtp-daemon not listening" >&1
+        exit 1
+fi