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

Proposed by Yolanda Robla on 2013-05-29
Status: Merged
Merged at revision: 126
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests
Merge into: lp:ubuntu/saucy/clamav
Diff against target: 46 lines (+13/-4)
3 files modified
debian/changelog (+7/-1)
debian/tests/clamd (+5/-2)
debian/tests/control (+1/-1)
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests
Reviewer Review Type Date Requested Status
Martin Pitt 2013-05-29 Approve on 2013-05-29
Review via email: mp+166196@code.launchpad.net

Description of the change

Fixed clamd tests to don't require network access

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks! Merged with some grammar fixes in the changelog.

review: Approve

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 2013-05-22 12:29:44 +0000
3+++ debian/changelog 2013-05-29 08:51:27 +0000
4@@ -1,8 +1,14 @@
5+clamav (0.97.8+dfsg-1ubuntu3) saucy; urgency=low
6+
7+ * debian/tests: updated clamd test to don't required network access
8+
9+ -- Yolanda Robla <yolanda.robla@canonical.com> Wed, 29 May 2013 10:41:31 +0200
10+
11 clamav (0.97.8+dfsg-1ubuntu2) saucy; urgency=low
12
13 * debian/tests: Add autopkgtest.
14
15- -- Yolanda <yolanda.robla@canonical.com> Wed, 22 May 2013 12:29:44 +0200
16+ -- Yolanda Robla <yolanda.robla@canonical.com> Wed, 22 May 2013 12:29:44 +0200
17
18 clamav (0.97.8+dfsg-1ubuntu1.13.04.1) raring-security; urgency=low
19
20
21=== modified file 'debian/tests/clamd'
22--- debian/tests/clamd 2013-05-22 12:29:44 +0000
23+++ debian/tests/clamd 2013-05-29 08:51:27 +0000
24@@ -5,8 +5,11 @@
25 set -e
26 DAEMON=clamd
27
28-# first refresh database with freshclam
29-freshclam > /dev/null 2>&1
30+# copy the file form unit tests to clamav directory
31+cp `dirname $0`/../../unit_tests/input/bytecode.cvd /var/lib/clamav/main.cvd > /dev/null 2>&1
32+cp `dirname $0`/../../unit_tests/input/bytecode.cvd /var/lib/clamav/daily.cvd > /dev/null 2>&1
33+
34+# restart clamav
35 /etc/init.d/clamav-daemon start > /dev/null 2>&1
36
37 if pidof -x $DAEMON > /dev/null; then
38
39=== modified file 'debian/tests/control'
40--- debian/tests/control 2013-05-22 12:29:44 +0000
41+++ debian/tests/control 2013-05-29 08:51:27 +0000
42@@ -1,3 +1,3 @@
43 Tests: clamd client milter
44-Depends: clamav-freshclam, clamav-daemon, clamav, clamav-milter
45+Depends: clamav-daemon, clamav, clamav-milter
46 Restrictions: needs-root

Subscribers

People subscribed via source and target branches

to all changes: