* d/tests/control: Add ceilometer-alarm-evaluator and

  ceilometer-alarm-notifier to depends.
* d/tests/test-services: Added to test that systemd services are running.
* d/tests/test-daemons: Dropped ceilometer-agent-{central,compute,ipmi}
  since they're replaced by ceilometer-polling.

4 files changed, 39 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 83c149b..9e2e647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 ceilometer (1:5.0.0~rc1-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ James Page ]
   * d/rules: Only execute unit tests during package build.
   * d/rules: Use upstream wrapper script to generate configuration file.
 
- -- James Page <james.page@ubuntu.com>  Thu, 01 Oct 2015 08:54:39 +0100
+  [ Corey Bryant ]
+  * d/tests/control: Add ceilometer-alarm-evaluator and
+    ceilometer-alarm-notifier to depends.
+  * d/tests/test-services: Added to test that systemd services are running.
+  * d/tests/test-daemons: Dropped ceilometer-agent-{central,compute,ipmi}
+    since they're replaced by ceilometer-polling.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 01 Oct 2015 08:52:03 -0400
 
 ceilometer (1:5.0.0~rc1-0ubuntu2) wily; urgency=medium
 
diff --git a/debian/tests/control b/debian/tests/control
index 7a44a2c..00d848c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: test-daemons test-python-ceilometer
-Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-ipmi, ceilometer-agent-notification, ceilometer-polling
+Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-ipmi, ceilometer-agent-notification, ceilometer-polling, ceilometer-alarm-evaluator, ceilometer-alarm-notifier
diff --git a/debian/tests/test-daemons b/debian/tests/test-daemons
index 2b0e640..6ee3489 100644
--- a/debian/tests/test-daemons
+++ b/debian/tests/test-daemons
@@ -3,7 +3,12 @@
 # Testing ceilometer-daemons
 #---------------------------
 set -e
-DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-notification', 'ceilometer-agent-compute', 'ceilometer-agent-central', 'ceilometer-agent-ipmi')
+DAEMONS=('ceilometer-agent-notification'
+         'ceilometer-alarm-evaluator'
+         'ceilometer-alarm-notifier'
+         'ceilometer-api'
+         'ceilometer-collector'
+         'ceilometer-polling')
 
 for daemon in "${DAEMONS[@]}"; do
     if pidof -x $daemon > /dev/null; then
diff --git a/debian/tests/test-services b/debian/tests/test-services
new file mode 100644
index 0000000..c47685d
--- /dev/null
+++ b/debian/tests/test-services
@@ -0,0 +1,23 @@
+#!/bin/bash
+#----------------------------
+# Testing ceilometer services
+#----------------------------
+set -e
+SERVICES=('ceilometer-agent-central'
+          'ceilometer-agent-compute'
+          'ceilometer-agent-ipmi'
+          'ceilometer-agent-notification'
+          'ceilometer-alarm-evaluator'
+          'ceilometer-alarm-notifier'
+          'ceilometer-api'
+          'ceilometer-collector'
+          'ceilometer-polling')
+
+for service in "${SERVICES[@]}"; do
+    if systemctl is-active $service > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${service} IS NOT RUNNING"
+        exit 1
+    fi
+done