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

[Yolanda Robla]

Added autopkgtests

[James Page (james-page)]

Yolanda

You need to create a new UNRELEASED changelog entry as the current version has already been uploaded to saucy.

(dch -i).

review: Needs Fixing

[lp:~yolanda.robla/nova/havana]

581. By Yolanda Robla on 2013-06-03

debian/changelog: added unreleased version

[Yolanda Robla (yolanda.robla)]

Recheck

[James Page (james-page)]

Tested against current saucy packages - works for me +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 12:55:48 +0000
+++ debian/changelog	2013-06-03 14:14:39 +0000
@@ -1,3 +1,9 @@
+nova (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/tests: added autopkgtests
+
+ -- Yolanda Robla <[e-mail]>  Mon, 03 Jun 2013 16:10:12 +0200
+
 nova (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]

=== modified file 'debian/control'
--- debian/control	2013-05-24 02:49:22 +0000
+++ debian/control	2013-06-03 14:14:39 +0000
@@ -54,6 +54,7 @@
 Homepage: http://launchpad.net/nova
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex/debian/files
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex
+XS-Testsuite: autopkgtest
 
 Package: python-nova
 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-03 14:14:39 +0000
@@ -0,0 +1,5 @@
+Tests: nova-compute-daemons nova-daemons nova-clients nova-api python-nova
+Depends: nova-compute, nova-conductor, nova-cert, nova-scheduler, nova-novncproxy,
+ nova-xvpvncproxy, nova-api, nova-network, nova-objectstore, nova-console,
+ nova-consoleauth, nova-baremetal, python-nova
+Restrictions: needs-root

=== added file 'debian/tests/nova-api'
--- debian/tests/nova-api	1970-01-01 00:00:00 +0000
+++ debian/tests/nova-api	2013-06-03 14:14:39 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-----------------
+# Testing nova-api
+#-----------------
+set -e
+DAEMONS=('nova-api-metadata' 'nova-api-os-compute' 'nova-api-ec2')
+
+for daemon in "${DAEMONS[@]}"; do
+    apt-get install -y $daemon 2>&1 > /dev/null
+
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+
+    apt-get remove -y $daemon 2>&1 > /dev/null
+done

=== added file 'debian/tests/nova-clients'
--- debian/tests/nova-clients	1970-01-01 00:00:00 +0000
+++ debian/tests/nova-clients	2013-06-03 14:14:39 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+HELP_CLIENTS=('nova-xvpvncproxy' 'nova-api')
+for client in "${HELP_CLIENTS[@]}"; do
+    RET=$($client -h 2>&1 > /dev/null)
+
+    if [[ $RET ]]; then
+        echo "ERROR, ${client} is not running"
+    fi
+done

=== added file 'debian/tests/nova-compute-daemons'
--- debian/tests/nova-compute-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/nova-compute-daemons	2013-06-03 14:14:39 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#---------------------
+# Testing nova-compute
+#---------------------
+set -e
+DAEMONS=('nova-compute-kvm' 'nova-compute-lxc' 'nova-compute-uml' 'nova-compute-xen' 'nova-compute-qemu' 'nova-compute-xcp')
+
+for daemon in "${DAEMONS[@]}"; do
+    apt-get install -y nova-compute $daemon 2>&1 > /dev/null
+
+    if pidof -x nova-compute > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: NOVA-COMPUTE IS NOT RUNNING"
+        exit 1
+    fi
+
+    apt-get remove -y $daemon nova-compute 2>&1 > /dev/null
+done

=== added file 'debian/tests/nova-daemons'
--- debian/tests/nova-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/nova-daemons	2013-06-03 14:14:39 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+#---------------------
+# Testing nova-daemons
+#---------------------
+set -e
+DAEMONS=('nova-conductor' 'nova-cert' 'nova-scheduler' 'nova-novncproxy' 'nova-network' 'nova-objectstore' \
+    'nova-console' 'nova-consoleauth' 'nova-baremetal-deploy-helper')
+
+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-nova'
--- debian/tests/python-nova	1970-01-01 00:00:00 +0000
+++ debian/tests/python-nova	2013-06-03 14:14:39 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_nova.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-NOVA MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi

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