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
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-31 15:01:05 +0000
+++ debian/changelog 2013-06-06 09:32:30 +0000
@@ -1,3 +1,9 @@
1cinder (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/tests: added autopkgtests
4
5 -- Yolanda Robla <yolanda.robla@canonical.com> Thu, 06 Jun 2013 11:22:15 +0200
6
1cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low7cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
28
3 [ Chuck Short ]9 [ Chuck Short ]
410
=== modified file 'debian/control'
--- debian/control 2013-05-27 16:53:38 +0000
+++ debian/control 2013-06-06 09:32:30 +0000
@@ -40,6 +40,7 @@
40 python-webob40 python-webob
41Standards-Version: 3.9.441Standards-Version: 3.9.4
42Homepage: http://launchpad.net/cinder42Homepage: http://launchpad.net/cinder
43XS-Testsuite: autopkgtest
4344
44Package: python-cinder45Package: python-cinder
45Section: python46Section: python
4647
=== added directory 'debian/tests'
=== added file 'debian/tests/cinder-daemons'
--- debian/tests/cinder-daemons 1970-01-01 00:00:00 +0000
+++ debian/tests/cinder-daemons 2013-06-06 09:32:30 +0000
@@ -0,0 +1,15 @@
1#!/bin/bash
2#-----------------------
3# Testing cinder-daemons
4#-----------------------
5set -e
6DAEMONS=('cinder-api' 'cinder-scheduler')
7
8for daemon in "${DAEMONS[@]}"; do
9 if pidof -x $daemon > /dev/null; then
10 echo "OK"
11 else
12 echo "ERROR: ${daemon} IS NOT RUNNING"
13 exit 1
14 fi
15done
016
=== added file 'debian/tests/cinder-volume'
--- debian/tests/cinder-volume 1970-01-01 00:00:00 +0000
+++ debian/tests/cinder-volume 2013-06-06 09:32:30 +0000
@@ -0,0 +1,17 @@
1#!/bin/bash
2#----------------------
3# Testing cinder-volume
4#----------------------
5set -e
6apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null
7DAEMONS=('cinder-volume' 'cinder-backup')
8
9for daemon in "${DAEMONS[@]}"; do
10 if pidof -x $daemon > /dev/null; then
11 echo "OK"
12 else
13 echo "ERROR: ${daemon} IS NOT RUNNING"
14 exit 1
15 fi
16done
17apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null
018
=== added file 'debian/tests/control'
--- debian/tests/control 1970-01-01 00:00:00 +0000
+++ debian/tests/control 2013-06-06 09:32:30 +0000
@@ -0,0 +1,3 @@
1Tests: python-cinder cinder-daemons cinder-volume
2Depends: python-cinder, cinder-api, cinder-scheduler, lvm2
3Restrictions: needs-root
04
=== added file 'debian/tests/python-cinder'
--- debian/tests/python-cinder 1970-01-01 00:00:00 +0000
+++ debian/tests/python-cinder 2013-06-06 09:32:30 +0000
@@ -0,0 +1,14 @@
1#!/bin/bash
2#-------------------------
3# Testing client utilities
4#-------------------------
5set -e
6
7result=$(python `dirname $0`/test_import_cinder.py 2>&1)
8if [ "$result" ]; then
9 echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED"
10 exit 1
11else
12 echo "OK"
13 exit 0
14fi
015
=== added file 'debian/tests/test_import_cinder.py'
--- debian/tests/test_import_cinder.py 1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_cinder.py 2013-06-06 09:32:30 +0000
@@ -0,0 +1,4 @@
1try:
2 import cinder
3except ImportError, e:
4 print "ERROR IMPORTING MODULE"

Subscribers

People subscribed via source and target branches