Merge lp:~ibm-demo/charms/trusty/ntpmaster/trunk into lp:charms/trusty/ntpmaster

[Matt Bruzek]

Adding tests to the ntpmaster charm for automation and to meet the trusty requirements.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1432-results

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1433-results

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10373-results

review: Needs Fixing (automated testing)

[Matt Bruzek (mbruzek)]

The failed automated tests appear to be timeout related. The tests run on other cloud environments just fine. The change was already merged by someone else. Thanks!

[Adam Israel (aisrael)]

Commenting to (hopefully) drop this out of the review queue

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-10-30 01:57:20 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# This script sets up the requirements for amulet tests.
+
+set -x 
+
+# Check if amulet is installed before adding the stable repository and updating apt-get.
+dpkg -s amulet
+if [ $? -ne 0 ]; then
+    sudo add-apt-repository -y ppa:juju/stable
+    sudo apt-get update -qq
+    sudo apt-get install -y amulet
+fi
+
+# Install any additional python packages or other required software.
+sudo apt-get install -y python3-requests
\ No newline at end of file

=== added file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
+++ tests/10-bundles-test.py	2014-10-30 01:57:20 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+# This amulet test deploys the bundles.yaml file in this directory.
+
+import os
+import unittest
+import yaml
+import amulet
+
+seconds_to_wait = 720
+
+
+class BundleTest(unittest.TestCase):
+    """ Create a class for testing the charm in the unit test framework. """
+    @classmethod
+    def setUpClass(cls):
+        """ Set up an amulet deployment using the bundle. """
+        d = amulet.Deployment()
+        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
+        with open(bundle_path, 'r') as bundle_file:
+            contents = yaml.safe_load(bundle_file)
+            d.load(contents)
+        d.setup(seconds_to_wait)
+        d.sentry.wait(seconds_to_wait)
+        cls.d = d
+
+    def test_deployed(self):
+        """ Test to see if the bundle deployed successfully. """
+        self.assertTrue(self.d.deployed)
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file

=== added file 'tests/bundles.yaml'
--- tests/bundles.yaml	1970-01-01 00:00:00 +0000
+++ tests/bundles.yaml	2014-10-30 01:57:20 +0000
@@ -0,0 +1,22 @@
+ntpmaster-ubuntu-ntp: 
+  services: 
+    ntpmaster: 
+      charm: ntpmaster
+      num_units: 1
+      options: 
+        source: 0.north-america.pool.ntp.org
+    ubuntu: 
+      charm: cs:trusty/ubuntu
+      num_units: 1
+      expose: true
+    ntp: 
+      charm: cs:trusty/ntp
+      num_units: 0
+      options: 
+        source: ntp.ubuntu.com
+  relations: 
+    - - "ubuntu:juju-info"
+      - "ntp:juju-info"
+    - - "ntp:master"
+      - "ntpmaster:master"
+  series: trusty