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

Proposed by Yolanda Robla
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/iscsitarget/dep-8-tests
Merge into: lp:ubuntu/saucy/iscsitarget
Diff against target: 59 lines (+30/-0)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/control (+3/-0)
debian/tests/daemon (+20/-0)
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/iscsitarget/dep-8-tests
Reviewer Review Type Date Requested Status
Martin Pitt Approve
James Hunt (community) Approve
Review via email: mp+163368@code.launchpad.net

Description of the change

Added dep-8-tests

To post a comment you must log in.
Revision history for this message
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1iscsitarget (1.4.20.2-5ubuntu2) saucy; urgency=low
2
3 * d/tests: added dep-8-tests
4
5 -- Yolanda <yolanda.robla@canonical.com> Fri, 10 May 2013 22:47:14 +0200
6
1iscsitarget (1.4.20.2-5ubuntu1) oneiric; urgency=low7iscsitarget (1.4.20.2-5ubuntu1) oneiric; urgency=low
28
3 * Resynchronise with Debian experimental. Remaining changes:9 * Resynchronise with Debian experimental. Remaining changes:
410
=== 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 @@
9Homepage: http://iscsitarget.sourceforge.net/9Homepage: http://iscsitarget.sourceforge.net/
10Vcs-Git: git://git.debian.org/git/pkg-iscsi/iscsitarget.git10Vcs-Git: git://git.debian.org/git/pkg-iscsi/iscsitarget.git
11Vcs-Browser: http://git.debian.org/?p=pkg-iscsi/iscsitarget.git11Vcs-Browser: http://git.debian.org/?p=pkg-iscsi/iscsitarget.git
12XS-Testsuite: autopkgtest
1213
13Package: iscsitarget14Package: iscsitarget
14Architecture: any15Architecture: any
1516
=== 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 @@
1Tests: daemon
2Depends: iscsitarget, iscsitarget-dkms
3Restrictions: needs-root
04
=== 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 @@
1#!/bin/bash
2#--------------------------
3# Testing iscitarget daemon
4#--------------------------
5set -e
6
7# modify /etc/default/iscsitarget to enable it
8CONFIG_FILE=/etc/default/iscsitarget
9TMP_CONFIG_FILE=/etc/default/iscsitarget.old
10sed -e "s/ISCSITARGET_ENABLE=false/ISCITARGET_ENABLE=true/g" $CONFIG_FILE > $TMP_CONFIG_FILE
11mv $TMP_CONFIG_FILE $CONFIG_FILE
12/etc/init.d/iscsitarget start >/dev/null 2>&1
13
14if ps aux | grep -v "grep" | grep -q "iscsitarget" > /dev/null; then
15 echo "OK"
16 exit 0
17else
18 echo "ERROR: ISCITARGET IS NOT RUNNING"
19 exit 1
20fi

Subscribers

People subscribed via source and target branches

to all changes: