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

[Yolanda Robla]

Added dep-8-tests

[James Hunt (jamesodhunt)]

LGTM.

review: Approve

[Martin Pitt (pitti)]

Verified on current saucy with "run-adt-test -sS lp:~yolanda.robla/ubuntu/saucy/iscsitarget/dep-8-tests iscsitarget".

Applied patch manually on apt-get source, as UDD branch is out of date. Closing MP manually.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-30 15:40:51 +0000
+++ debian/changelog	2013-05-10 20:51:29 +0000
@@ -1,3 +1,9 @@
+iscsitarget (1.4.20.2-5ubuntu2) saucy; urgency=low
+
+  * d/tests: added dep-8-tests
+
+ -- Yolanda <[e-mail]>  Fri, 10 May 2013 22:47:14 +0200
+
 iscsitarget (1.4.20.2-5ubuntu1) oneiric; urgency=low
 
   * Resynchronise with Debian experimental. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-06-29 11:04:54 +0000
+++ debian/control	2013-05-10 20:51:29 +0000
@@ -9,6 +9,7 @@
 Homepage: http://iscsitarget.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-iscsi/iscsitarget.git
 Vcs-Browser: http://git.debian.org/?p=pkg-iscsi/iscsitarget.git
+XS-Testsuite: autopkgtest
 
 Package: iscsitarget
 Architecture: any

=== 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 20:51:29 +0000
@@ -0,0 +1,3 @@
+Tests: daemon
+Depends: iscsitarget, iscsitarget-dkms
+Restrictions: needs-root

=== added file 'debian/tests/daemon'
--- debian/tests/daemon	1970-01-01 00:00:00 +0000
+++ debian/tests/daemon	2013-05-10 20:51:29 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+#--------------------------
+# Testing iscitarget daemon
+#--------------------------
+set -e
+
+# modify /etc/default/iscsitarget to enable it
+CONFIG_FILE=/etc/default/iscsitarget
+TMP_CONFIG_FILE=/etc/default/iscsitarget.old
+sed -e "s/ISCSITARGET_ENABLE=false/ISCITARGET_ENABLE=true/g" $CONFIG_FILE > $TMP_CONFIG_FILE
+mv $TMP_CONFIG_FILE $CONFIG_FILE
+/etc/init.d/iscsitarget start >/dev/null 2>&1
+
+if ps aux | grep -v "grep" | grep -q "iscsitarget" > /dev/null; then
+    echo "OK"
+    exit 0
+else
+    echo "ERROR: ISCITARGET IS NOT RUNNING"
+    exit 1
+fi