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

[Yolanda Robla]

Fixed clamd tests to don't require network access

[Martin Pitt (pitti)]

Thanks! Merged with some grammar fixes in the changelog.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-22 12:29:44 +0000
+++ debian/changelog	2013-05-29 08:51:27 +0000
@@ -1,8 +1,14 @@
+clamav (0.97.8+dfsg-1ubuntu3) saucy; urgency=low
+
+  * debian/tests: updated clamd test to don't required network access
+
+ -- Yolanda Robla <[e-mail]>  Wed, 29 May 2013 10:41:31 +0200
+
 clamav (0.97.8+dfsg-1ubuntu2) saucy; urgency=low
 
   * debian/tests: Add autopkgtest.
 
- -- Yolanda <[e-mail]>  Wed, 22 May 2013 12:29:44 +0200
+ -- Yolanda Robla <[e-mail]>  Wed, 22 May 2013 12:29:44 +0200
 
 clamav (0.97.8+dfsg-1ubuntu1.13.04.1) raring-security; urgency=low
 
 
=== modified file 'debian/tests/clamd'
--- debian/tests/clamd	2013-05-22 12:29:44 +0000
+++ debian/tests/clamd	2013-05-29 08:51:27 +0000
@@ -5,8 +5,11 @@
 set -e
 DAEMON=clamd
 
-# first refresh database with freshclam
-freshclam > /dev/null 2>&1
+# copy the file form unit tests to clamav directory
+cp `dirname $0`/../../unit_tests/input/bytecode.cvd /var/lib/clamav/main.cvd > /dev/null 2>&1
+cp `dirname $0`/../../unit_tests/input/bytecode.cvd /var/lib/clamav/daily.cvd > /dev/null 2>&1
+
+# restart clamav
 /etc/init.d/clamav-daemon start > /dev/null 2>&1
 
 if pidof -x $DAEMON > /dev/null; then
 
=== modified file 'debian/tests/control'
--- debian/tests/control	2013-05-22 12:29:44 +0000
+++ debian/tests/control	2013-05-29 08:51:27 +0000
@@ -1,3 +1,3 @@
 Tests: clamd client milter
-Depends: clamav-freshclam, clamav-daemon, clamav, clamav-milter
+Depends: clamav-daemon, clamav, clamav-milter
 Restrictions: needs-root