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

[Yolanda Robla]

Added autopkgtests

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 13:22:28 +0000
+++ debian/changelog	2013-06-05 14:39:34 +0000
@@ -1,3 +1,9 @@
+glance (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/tests: added autopkgtests
+
+ -- Yolanda Robla <[e-mail]>  Wed, 05 Jun 2013 16:34:14 +0200
+
 glance (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2013-04-30 14:34:41 +0000
+++ debian/control	2013-06-05 14:39:34 +0000
@@ -40,6 +40,7 @@
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/glance
+XS-Testsuite: autopkgtest
 
 Package: python-glance
 Architecture: all

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-06-05 14:39:34 +0000
@@ -0,0 +1,3 @@
+Tests: python-glance glance-daemons
+Depends: python-glance, glance-api, glance-registry
+Restrictions: needs-root

=== added file 'debian/tests/glance-daemons'
--- debian/tests/glance-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/glance-daemons	2013-06-05 14:39:34 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+#---------------------
+# Testing glance-daemons
+#---------------------
+set -e
+DAEMONS=('glance-api' 'glance-registry')
+
+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/python-glance'
--- debian/tests/python-glance	1970-01-01 00:00:00 +0000
+++ debian/tests/python-glance	2013-06-05 14:39:34 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_glance.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-GLANCE MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi

=== added file 'debian/tests/test_import_glance.py'
--- debian/tests/test_import_glance.py	1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_glance.py	2013-06-05 14:39:34 +0000
@@ -0,0 +1,4 @@
+try:
+    import glance
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"