Merge lp:~ev/amulet/fix-no-relations into lp:~vila/amulet/ci

[Evan]

Added a test for the previous merged fix for handling an environment without relations set.

=== modified file 'tests/test_deployer.py'
--- tests/test_deployer.py	2013-08-08 01:56:09 +0000
+++ tests/test_deployer.py	2014-01-09 10:11:20 +0000
@@ -52,6 +52,16 @@
         self.assertEqual(dmap['gojuju']['relations'], d.relations)
         self.assertEqual(dmap['gojuju']['series'], d.series)
 
+        # Try again without any relations.
+        schema = '{"gojuju": {"series": "raring", "services": {"wordpress": \
+                  {"branch": "lp:charms/wordpress"}, "mysql": {"options": \
+                  {"tuning": "fastest"}, "branch": "lp:charms/mysql"}} \
+                  }}'
+        dmap = json.loads(schema)
+        d.load(dmap)
+        self.assertEqual(dmap['gojuju']['services'], d.services)
+        self.assertEqual(dmap['gojuju']['series'], d.series)
+
     def test_add(self):
         d = Deployment(juju_env='gojuju')
         d.add('charm')