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

[Yolanda Robla]

Added autopkgtests

[Chuck Short (zulcss)]

needs to be UNRELEASED in the debian/changelog

review: Needs Fixing

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

158. By Yolanda Robla on 2013-06-05

Modified to UNRELEASED

[Yolanda Robla (yolanda.robla)]

recheck

[Chuck Short (zulcss)]

merge conflict

review: Needs Fixing

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

159. By Yolanda Robla on 2013-06-07

* debian/control:
  - Add version requirement to python-stevedore (>= 0.8), also add to
    python-quantum depends.
  - Add version requirement to python-fixtures (>= 0.3.12).

[Chuck Short (zulcss)]

Please collapse the changelog into the previous UNRELEASED branch

review: Needs Fixing

[Chuck Short (zulcss)]

review: Needs Fixing

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

160. By Yolanda Robla on 2013-06-07

[ Yolanda Robla ]
debian/tests: added autopkg tests

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-04 19:00:19 +0000
+++ debian/changelog	2013-06-07 16:23:28 +0000
@@ -1,12 +1,16 @@
 quantum (1:2013.2~b1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Adam Gandelman ]
   * debian/control:
     - Add version requirement to python-stevedore (>= 0.8), also add to
       python-quantum depends.
     - Add version requirement to python-fixtures (>= 0.3.12).
   * debian/patches/*: Refreshed.
 
- -- Adam Gandelman <[e-mail]>  Wed, 29 May 2013 11:54:06 -0700
+  [ Yolanda Robla ]
+  * debian/tests: added autopkg tests
+
+ -- Yolanda Robla <[e-mail]>  Tue, 04 Jun 2013 12:16:29 +0200
 
 quantum (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-06-04 19:00:19 +0000
+++ debian/control	2013-06-07 16:23:28 +0000
@@ -45,6 +45,7 @@
  testrepository ( >= 0.0.8)
 XS-Python-Version: >= 2.6
 Standards-Version: 3.9.4
+XS-Testsuite: autopkgtest
 
 Package: quantum-server
 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-07 16:23:28 +0000
@@ -0,0 +1,4 @@
+Tests: quantum-daemons python-quantum
+Depends: quantum-server, quantum-l3-agent, quantum-dhcp-agent, quantum-metadata-agent,
+ quantum-lbaas-agent, python-quantum
+Restrictions: needs-root
 
=== added file 'debian/tests/python-quantum'
--- debian/tests/python-quantum	1970-01-01 00:00:00 +0000
+++ debian/tests/python-quantum	2013-06-07 16:23:28 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_quantum.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-QUANTUM MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi
 
=== added file 'debian/tests/quantum-daemons'
--- debian/tests/quantum-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/quantum-daemons	2013-06-07 16:23:28 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-----------------------
+# Testing quantum-daemon
+#-----------------------
+set -e
+DAEMONS=('quantum-server' 'quantum-l3-agent' 'quantum-dhcp-agent' 'quantum-metadata-agent' 'quantum-lbaas-agent')
+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/test_import_quantum.py'
--- debian/tests/test_import_quantum.py	1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_quantum.py	2013-06-07 16:23:28 +0000
@@ -0,0 +1,4 @@
+try:
+    import quantum
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"