Merge lp:~yolanda.robla/cinder/havana into lp:~openstack-ubuntu-testing/cinder/havana

Proposed by Yolanda Robla on 2013-06-06
Status: Merged
Merged at revision: 107
Proposed branch: lp:~yolanda.robla/cinder/havana
Merge into: lp:~openstack-ubuntu-testing/cinder/havana
Diff against target: 104 lines (+60/-0)
7 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/cinder-daemons (+15/-0)
debian/tests/cinder-volume (+17/-0)
debian/tests/control (+3/-0)
debian/tests/python-cinder (+14/-0)
debian/tests/test_import_cinder.py (+4/-0)
To merge this branch: bzr merge lp:~yolanda.robla/cinder/havana
Reviewer Review Type Date Requested Status
Chuck Short (community) 2013-06-06 Approve on 2013-06-07
Review via email: mp+167726@code.launchpad.net

Description of the change

Added autopkgtests

To post a comment you must log in.
Chuck Short (zulcss) :
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-31 15:01:05 +0000
3+++ debian/changelog 2013-06-06 09:32:30 +0000
4@@ -1,3 +1,9 @@
5+cinder (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/tests: added autopkgtests
8+
9+ -- Yolanda Robla <yolanda.robla@canonical.com> Thu, 06 Jun 2013 11:22:15 +0200
10+
11 cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
12
13 [ Chuck Short ]
14
15=== modified file 'debian/control'
16--- debian/control 2013-05-27 16:53:38 +0000
17+++ debian/control 2013-06-06 09:32:30 +0000
18@@ -40,6 +40,7 @@
19 python-webob
20 Standards-Version: 3.9.4
21 Homepage: http://launchpad.net/cinder
22+XS-Testsuite: autopkgtest
23
24 Package: python-cinder
25 Section: python
26
27=== added directory 'debian/tests'
28=== added file 'debian/tests/cinder-daemons'
29--- debian/tests/cinder-daemons 1970-01-01 00:00:00 +0000
30+++ debian/tests/cinder-daemons 2013-06-06 09:32:30 +0000
31@@ -0,0 +1,15 @@
32+#!/bin/bash
33+#-----------------------
34+# Testing cinder-daemons
35+#-----------------------
36+set -e
37+DAEMONS=('cinder-api' 'cinder-scheduler')
38+
39+for daemon in "${DAEMONS[@]}"; do
40+ if pidof -x $daemon > /dev/null; then
41+ echo "OK"
42+ else
43+ echo "ERROR: ${daemon} IS NOT RUNNING"
44+ exit 1
45+ fi
46+done
47
48=== added file 'debian/tests/cinder-volume'
49--- debian/tests/cinder-volume 1970-01-01 00:00:00 +0000
50+++ debian/tests/cinder-volume 2013-06-06 09:32:30 +0000
51@@ -0,0 +1,17 @@
52+#!/bin/bash
53+#----------------------
54+# Testing cinder-volume
55+#----------------------
56+set -e
57+apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null
58+DAEMONS=('cinder-volume' 'cinder-backup')
59+
60+for daemon in "${DAEMONS[@]}"; do
61+ if pidof -x $daemon > /dev/null; then
62+ echo "OK"
63+ else
64+ echo "ERROR: ${daemon} IS NOT RUNNING"
65+ exit 1
66+ fi
67+done
68+apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null
69
70=== added file 'debian/tests/control'
71--- debian/tests/control 1970-01-01 00:00:00 +0000
72+++ debian/tests/control 2013-06-06 09:32:30 +0000
73@@ -0,0 +1,3 @@
74+Tests: python-cinder cinder-daemons cinder-volume
75+Depends: python-cinder, cinder-api, cinder-scheduler, lvm2
76+Restrictions: needs-root
77
78=== added file 'debian/tests/python-cinder'
79--- debian/tests/python-cinder 1970-01-01 00:00:00 +0000
80+++ debian/tests/python-cinder 2013-06-06 09:32:30 +0000
81@@ -0,0 +1,14 @@
82+#!/bin/bash
83+#-------------------------
84+# Testing client utilities
85+#-------------------------
86+set -e
87+
88+result=$(python `dirname $0`/test_import_cinder.py 2>&1)
89+if [ "$result" ]; then
90+ echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED"
91+ exit 1
92+else
93+ echo "OK"
94+ exit 0
95+fi
96
97=== added file 'debian/tests/test_import_cinder.py'
98--- debian/tests/test_import_cinder.py 1970-01-01 00:00:00 +0000
99+++ debian/tests/test_import_cinder.py 2013-06-06 09:32:30 +0000
100@@ -0,0 +1,4 @@
101+try:
102+ import cinder
103+except ImportError, e:
104+ print "ERROR IMPORTING MODULE"

Subscribers

People subscribed via source and target branches