Merge lp:~mbruzek/charms/trusty/ubuntu/trunk into lp:charms/trusty/ubuntu

[Matt Bruzek]

Making the tests work with the trusty series.

[Matt Bruzek (mbruzek)]

I noticed the amulet test in ubuntu deployed precise version of ubuntu. I fixed that and added more smarts in the test.

[Charles Butler (lazypower)]

Thanks for the contribution mbruzek. I'm confident these changes are solid - they passed my local testing. I just kicked off a CI job and will merge once the results come back green. +1

[Charles Butler (lazypower)]

And it just wrapped up - LGTM http://reports.vapour.ws/charm-tests/charm-bundle-test-11045-results

review: Approve

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://reports.vapour.ws/charm-tests/charm-bundle-test-11045-results

review: Approve (automated testing)

=== modified file 'tests/00-setup.sh'
--- tests/00-setup.sh	2014-01-25 03:15:50 +0000
+++ tests/00-setup.sh	2015-02-19 18:14:52 +0000
@@ -1,7 +1,15 @@
-#!/bin/sh
-
-# Install Amulet testing harness as it is not on the 
-# default cloud image.  Amulet should pull in its dependencies.
-sudo add-apt-repository -y ppa:juju/stable
-sudo apt-get update 
-sudo apt-get install -y amulet
+#!/bin/bash
+
+# This script runs first to set up the environment for the tests.
+
+set -x 
+
+# Check if amulet is installed before adding 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 packages needed for tests here.
+
 
=== modified file 'tests/10-deploy-test.py'
--- tests/10-deploy-test.py	2014-01-25 03:15:50 +0000
+++ tests/10-deploy-test.py	2015-02-19 18:14:52 +0000
@@ -3,18 +3,17 @@
 # This Amulet based tests
 # The goal is to ensure the Ubuntu charm
 # sucessfully deploys and can be accessed.
-# Note the Ubuntu charm does not have any 
+# Note the Ubuntu charm does not have any
 # relations or config options.
 
 import amulet
-#import os
-#import requests
 
 # Timeout value, in seconds to deploy the environment
 seconds = 900
+series = 'trusty'
 
 # Set up the deployer module to interact and set up the environment.
-d = amulet.Deployment()
+d = amulet.Deployment(series=series)
 
 # Define the environment in terms of charms, their config, and relations.
 
@@ -29,7 +28,6 @@
     d.setup(timeout=seconds)
     # Use a sentry to ensure there are no remaining hooks being execute
     # on any of the nodes
-##    d.sentry.wait()
 except amulet.helpers.TimeoutError:
     # Pending the configuration the test will fail or be skipped
     # if not deployed properly.
@@ -40,32 +38,36 @@
     # will automatically "FAIL" the test.
     raise
 
-# Access the Ubuntu instance to ensure it has been deployed correctly 
+# Access the Ubuntu instance to ensure it has been deployed correctly
 
 # Define the commands to be ran
-lsb_release_command = 'cat /etc/lsb-release'
+lsb_command = 'lsb_release -cs'
 uname_command = 'uname -a'
 
-# Cat the release information
-output, code = d.sentry.unit['ubuntu/0'].run(lsb_release_command)
-# Confirm the lsb-release command was ran successfully
+print(lsb_command)
+# Print the release information
+output, code = d.sentry.unit['ubuntu/0'].run(lsb_command)
+print(output)
+# Confirm the lsb_release command ran successfully
 if (code != 0):
-    error_message = 'The ' + lsb_release_command + ' did not return the expected return code of 0.'
-    print(output)
-    amulet.raise_status(amulet.FAIL, msg=error_message)
+    message = 'The ' + lsb_command + ' did not return the expected return code of 0.'
+    amulet.raise_status(amulet.FAIL, msg=message)
 else:
-    message = 'The lsb-release command successfully executed.'
-    print(output)
-    print(message)
+    if series in output:
+        print('The series is correct.')
+    else:
+        message = 'The series is not correct.'
+        print(message)
+        amulet.raise_status(amulet.FAIL, msg=message)
 
-# Get the uname -a output 
+print(uname_command)
+# Get the uname -a output
 output, code = d.sentry.unit['ubuntu/0'].run(uname_command)
+print(output)
 # Confirm the uname command was ran successfully
 if (code != 0):
-    error_message = 'The ' + uname_command + ' did not return the expected return code of 0.'
-    print(output)
-    amulet.raise_status(amulet.FAIL, msg=error_message)
+    message = 'The ' + uname_command + ' did not return the expected return code of 0.'
+    amulet.raise_status(amulet.FAIL, msg=message)
 else:
     message = 'The uname command successfully executed.'
-    print(output)
     print(message)