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

Proposed by Yolanda Robla
Status: Merged
Approved by: Chuck Short
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~yolanda.robla/heat/havana
Merge into: lp:~openstack-ubuntu-testing/heat/havana
Diff against target: 82 lines (+43/-0)
6 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/control (+3/-0)
debian/tests/heat-daemons (+15/-0)
debian/tests/python-heat (+14/-0)
debian/tests/test_import_heat.py (+4/-0)
To merge this branch: bzr merge lp:~yolanda.robla/heat/havana
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+168098@code.launchpad.net

Description of the change

Added autopkgtests

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-29 17:36:41 +0000
3+++ debian/changelog 2013-06-07 15:11:30 +0000
4@@ -1,3 +1,9 @@
5+heat (2013.1-4ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/tests: added autopkg tests
8+
9+ -- Yolanda Robla <yolanda.robla@canonical.com> Fri, 07 Jun 2013 17:02:11 +0200
10+
11 heat (2013.1-4) unstable; urgency=low
12
13 * Fixed the dbsync to the new thing upstream is using (it was crashing the
14
15=== modified file 'debian/control'
16--- debian/control 2013-05-29 17:36:41 +0000
17+++ debian/control 2013-06-07 15:11:30 +0000
18@@ -52,6 +52,7 @@
19 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
20 Vcs-Git: git://anonscm.debian.org/openstack/heat.git
21 Homepage: http://wiki.openstack.org/Heat
22+XS-Testsuite: autopkgtest
23
24 Package: python-heat
25 Section: python
26
27=== added directory 'debian/tests'
28=== added file 'debian/tests/control'
29--- debian/tests/control 1970-01-01 00:00:00 +0000
30+++ debian/tests/control 2013-06-07 15:11:30 +0000
31@@ -0,0 +1,3 @@
32+Tests: python-heat heat-daemons
33+Depends: python-heat, heat-engine, heat-api, heat-api-cfn, heat-api-cloudwatch
34+Restrictions: needs-root
35
36=== added file 'debian/tests/heat-daemons'
37--- debian/tests/heat-daemons 1970-01-01 00:00:00 +0000
38+++ debian/tests/heat-daemons 2013-06-07 15:11:30 +0000
39@@ -0,0 +1,15 @@
40+#!/bin/bash
41+#---------------------
42+# Testing nova-daemons
43+#---------------------
44+set -e
45+DAEMONS=('heat-engine' 'heat-api' 'heat-api-cfn' 'heat-api-cloudwatch')
46+
47+for daemon in "${DAEMONS[@]}"; do
48+ if pidof -x $daemon > /dev/null; then
49+ echo "OK"
50+ else
51+ echo "ERROR: ${daemon} IS NOT RUNNING"
52+ exit 1
53+ fi
54+done
55
56=== added file 'debian/tests/python-heat'
57--- debian/tests/python-heat 1970-01-01 00:00:00 +0000
58+++ debian/tests/python-heat 2013-06-07 15:11:30 +0000
59@@ -0,0 +1,14 @@
60+#!/bin/bash
61+#-------------------------
62+# Testing client utilities
63+#-------------------------
64+set -e
65+
66+result=$(python `dirname $0`/test_import_heat.py 2>&1)
67+if [ "$result" ]; then
68+ echo "ERROR: PYTHON-HEAT MODULE CANNOT BE IMPORTED"
69+ exit 1
70+else
71+ echo "OK"
72+ exit 0
73+fi
74
75=== added file 'debian/tests/test_import_heat.py'
76--- debian/tests/test_import_heat.py 1970-01-01 00:00:00 +0000
77+++ debian/tests/test_import_heat.py 2013-06-07 15:11:30 +0000
78@@ -0,0 +1,4 @@
79+try:
80+ import heat
81+except ImportError, e:
82+ print "ERROR IMPORTING MODULE"

Subscribers

People subscribed via source and target branches