Comment 5 for bug 1375865

Chris, nice charm! This gets my +1, LGTM, but I do have some small suggestions if you're willing to make them before we merge this.

The TLDR is:

1. metadata: categories have changed to tags
2. amulet has new fixes so you don't have to specify branches explicitly.

Here's the diff:

> bzr diff
=== modified file 'metadata.yaml'
--- metadata.yaml 2014-09-22 16:07:30 +0000
+++ metadata.yaml 2014-10-29 14:03:41 +0000
@@ -14,8 +14,8 @@
   resistance + database and configuration files can be signed
   + logfile entries and e-mail reports are signed + support for
   stealth operation
-categories:
- - misc
+tags:
+ - security
 subordinate: true
 requires:
   juju-info:

=== modified file 'tests/10-basic-tests'
--- tests/10-basic-tests 2014-10-03 15:09:29 +0000
+++ tests/10-basic-tests 2014-10-29 14:13:06 +0000
@@ -1,12 +1,12 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import amulet
 import time

 d = amulet.Deployment(series="trusty")

-d.add('apache2', 'cs:trusty/apache2-4')
-d.add('samhain', 'cs:~chris-gondolin/trusty/samhain')
+d.add('apache2')
+d.add('samhain')
 d.add('nrpe-external-master', 'cs:~webteam-backend/trusty/nrpe-external-master-0')

 d.relate('apache2:juju-info', 'samhain:juju-info')
@@ -21,7 +21,7 @@
 except:
     raise

-unit = d.sentry.unit['apache2/0']
+unit = d.sentry['apache2/0']

 # Check config file was created
 if "samhainrc" not in unit.directory_contents("/etc/samhain")["files"]: