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

[Yolanda Robla]

Added autopkgtests

[Chuck Short (zulcss)]

review: Approve

=== 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 @@
+cinder (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/tests: added autopkgtests
+
+ -- Yolanda Robla <[e-mail]>  Thu, 06 Jun 2013 11:22:15 +0200
+
 cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]

=== 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 @@
  python-webob
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder
+XS-Testsuite: autopkgtest
 
 Package: python-cinder
 Section: python

=== 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 @@
+#!/bin/bash
+#-----------------------
+# Testing cinder-daemons
+#-----------------------
+set -e
+DAEMONS=('cinder-api' 'cinder-scheduler')
+
+for daemon in "${DAEMONS[@]}"; do
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+done

=== 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 @@
+#!/bin/bash
+#----------------------
+# Testing cinder-volume
+#----------------------
+set -e
+apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null
+DAEMONS=('cinder-volume' 'cinder-backup')
+
+for daemon in "${DAEMONS[@]}"; do
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+done
+apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null

=== 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 @@
+Tests: python-cinder cinder-daemons cinder-volume
+Depends: python-cinder, cinder-api, cinder-scheduler, lvm2
+Restrictions: needs-root

=== 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 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_cinder.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi

=== 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 @@
+try:
+    import cinder
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"