Ubuntu
varnish package

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

  1. Saucy (13.10)
  2. dep-8-tests
  3. Merge into saucy
Proposed by Yolanda Robla
Status: Merged
Merged at revision: 36
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/varnish/dep-8-tests
Merge into: lp:ubuntu/saucy/varnish
Diff against target: 75 lines (+41/-0)
5 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/control (+3/-0)
debian/tests/daemon (+13/-0)
debian/tests/ncsa (+18/-0)
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/varnish/dep-8-tests
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+165618@code.launchpad.net

Description of the change

Added dep-8-tests

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

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

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-05 15:53:14 +0000
3+++ debian/changelog 2013-05-24 13:40:35 +0000
4@@ -1,3 +1,9 @@
5+varnish (3.0.3-1ubuntu1) saucy; urgency=low
6+
7+ * d/tests: added dep-8-tests
8+
9+ -- Yolanda <yolanda.robla@canonical.com> Fri, 24 May 2013 15:16:58 +0200
10+
11 varnish (3.0.3-1) unstable; urgency=low
12
13 [ Stig Sandbeck Mathisen ]
14
15=== modified file 'debian/control'
16--- debian/control 2013-05-05 15:53:14 +0000
17+++ debian/control 2013-05-24 13:40:35 +0000
18@@ -24,6 +24,7 @@
19 Vcs-Git: git://git.debian.org/pkg-varnish/pkg-varnish.git
20 Homepage: http://varnish-cache.org/
21 Standards-Version: 3.9.3
22+XS-Testsuite: autopkgtest
23
24 Package: varnish
25 Architecture: any
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-24 13:40:35 +0000
31@@ -0,0 +1,3 @@
32+Tests: daemon ncsa
33+Depends: varnish
34+Restrictions: needs-root
35
36=== added file 'debian/tests/daemon'
37--- debian/tests/daemon 1970-01-01 00:00:00 +0000
38+++ debian/tests/daemon 2013-05-24 13:40:35 +0000
39@@ -0,0 +1,13 @@
40+#!/bin/bash
41+#----------------
42+# Testing varnish
43+#----------------
44+set -e
45+DAEMON=varnishd
46+
47+if pidof -x $DAEMON > /dev/null; then
48+ echo "OK"
49+else
50+ echo "ERROR: ${DAEMON} IS NOT RUNNING"
51+ exit 1
52+fi
53
54=== added file 'debian/tests/ncsa'
55--- debian/tests/ncsa 1970-01-01 00:00:00 +0000
56+++ debian/tests/ncsa 2013-05-24 13:40:35 +0000
57@@ -0,0 +1,18 @@
58+#!/bin/bash
59+#--------------------
60+# Testing varnishncsa
61+#--------------------
62+set -e
63+
64+# modify varnishncsa file
65+CONFIG_FILE=/etc/default/varnishncsa
66+DAEMON=varnishncsa
67+sed -i -e "s/# VARNISHNCSA_ENABLED=1/VARNISHNCSA_ENABLED=1/g" $CONFIG_FILE
68+/etc/init.d/${DAEMON} restart
69+
70+if pidof -x $DAEMON > /dev/null; then
71+ echo "OK"
72+else
73+ echo "ERROR: ${DAEMON} IS NOT RUNNING"
74+ exit 1
75+fi

Subscribers

People subscribed via source and target branches

to all changes: