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

Proposed by Yolanda Robla
Status: Needs review
Proposed branch: lp:~yolanda.robla/amavisd-new/dep-8-tests
Merge into: lp:ubuntu/saucy/amavisd-new
Diff against target: 87 lines (+53/-0)
5 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/control (+3/-0)
debian/tests/hostandport (+20/-0)
debian/tests/smtpdaemon (+23/-0)
To merge this branch: bzr merge lp:~yolanda.robla/amavisd-new/dep-8-tests
Reviewer Review Type Date Requested Status
VCS imports Pending
Review via email: mp+161380@code.launchpad.net

Description of the change

Added dep-8 tests

To post a comment you must log in.
35. By Yolanda Robla

fixing control

36. By Yolanda Robla

fixing control

37. By Yolanda Robla

d/tests: added dep-8-tests

Unmerged revisions

37. By Yolanda Robla

d/tests: added dep-8-tests

36. By Yolanda Robla

fixing control

35. By Yolanda Robla

fixing control

34. By Yolanda Robla

adding dep-8 tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-21 10:23:40 +0000
3+++ debian/changelog 2013-05-10 15:36:24 +0000
4@@ -1,3 +1,9 @@
5+amavisd-new (1:2.7.1-2ubuntu4) saucy; urgency=low
6+
7+ * d/tests: added dep-8-tests
8+
9+ -- Yolanda <yolanda.robla@canonical.com> Fri, 10 May 2013 17:33:02 +0200
10+
11 amavisd-new (1:2.7.1-2ubuntu3) quantal; urgency=low
12
13 * debian/control: drop altermime and ripole to Suggests after discussions
14
15=== modified file 'debian/control'
16--- debian/control 2012-09-21 10:23:40 +0000
17+++ debian/control 2013-05-10 15:36:24 +0000
18@@ -8,6 +8,7 @@
19 Standards-Version: 3.9.3
20 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=amavisd-new/pkg-amavisd-new.git;a=summary
21 Vcs-Git: git://anonscm.debian.org/amavisd-new/pkg-amavisd-new.git
22+XS-Testsuite: autopkgtest
23
24 Package: amavisd-new
25 Architecture: all
26
27=== added directory 'debian/tests'
28=== added file 'debian/tests/control'
29--- debian/tests/control 1970-01-01 00:00:00 +0000
30+++ debian/tests/control 2013-05-10 15:36:24 +0000
31@@ -0,0 +1,3 @@
32+Tests: hostandport smtpdaemon
33+Depends: netcat, postfix, amavisd-new
34+Restrictions: needs-root
35
36=== added file 'debian/tests/hostandport'
37--- debian/tests/hostandport 1970-01-01 00:00:00 +0000
38+++ debian/tests/hostandport 2013-05-10 15:36:24 +0000
39@@ -0,0 +1,20 @@
40+#!/bin/bash
41+#------------------------------
42+# Testing amavisd host and port
43+#------------------------------
44+MACHINE=127.0.0.1
45+PORT=10024
46+
47+# modify hostname from amavis
48+hostname localhost
49+/etc/init.d/amavis restart >/dev/null 2>&1
50+
51+netcat -z ${MACHINE} ${PORT}
52+if [ $? -eq 0 ]
53+then
54+ echo "OK"
55+ exit 0
56+else
57+ echo "ERROR: amavisd-new not listening" >&1
58+ exit 1
59+fi
60
61=== added file 'debian/tests/smtpdaemon'
62--- debian/tests/smtpdaemon 1970-01-01 00:00:00 +0000
63+++ debian/tests/smtpdaemon 2013-05-10 15:36:24 +0000
64@@ -0,0 +1,23 @@
65+#!/bin/bash
66+#-------------------------------
67+# Testing the new Postfix daemon
68+#-------------------------------
69+MACHINE=127.0.0.1
70+PORT=10025
71+
72+# modify hostname from amavis
73+hostname localhost
74+/etc/init.d/amavis restart >/dev/null 2>&1
75+
76+apt-get install -y amavisd-new-postfix >/dev/null 2>&1
77+#/etc/init.d/postfix restart >/dev/null 2>&1
78+
79+netcat -z ${MACHINE} ${PORT}
80+if [ $? -eq 0 ]
81+then
82+ echo "OK"
83+ exit 0
84+else
85+ echo "ERROR: smtp-daemon not listening" >&1
86+ exit 1
87+fi

Subscribers

People subscribed via source and target branches

to all changes: