Merge lp:~gz/ubuntu-ci-services-itself/intergration_test_fancy into lp:ubuntu-ci-services-itself

[Martin Packman]

Use python fixtures to isolate the deployer part into its own fixture.

Refactoring of new integration tests to use some testing niceties, which should make reuse of the concepts easier.

Implements the setup of a juju deployment in terms of a lp:python-fixtures Fixture, this means tests can be explicit about reusing the same environment, and has room for adding cleanUp() and reset() methods.

The test assertions are now bundled in a unittest testcase as previously planned.

[Evan (ev)]

The import sys is no longer needed, otherwise +1.

review: Approve

[Chris Johnston (cjohnston)]

The prerequisite https://code.launchpad.net/~vila/ubuntu-ci-services-itself/ppa-assigner-integration-test has not yet been merged into https://code.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/trunk.

[Chris Johnston (cjohnston)]

The prerequisite https://code.launchpad.net/~vila/ubuntu-ci-services-itself/ppa-assigner-integration-test has not yet been merged into https://code.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/trunk.

=== modified file 'tests/ppa_assigner/test.py'
--- tests/ppa_assigner/test.py	2013-12-19 11:24:51 +0000
+++ tests/ppa_assigner/test.py	2013-12-19 11:24:51 +0000
@@ -1,48 +1,68 @@
 #!/usr/bin/env python
 
 import json
+import os
+import sys
+import unittest
+
 import httplib2
+import fixtures
 import yaml
-import os
-import sys
+
+import amulet
 
 opd = os.path.dirname
 
 root_dir = opd(opd(opd((os.path.abspath(__file__)))))
 
-import amulet
-
-def main():
-    # FIXME: Running amulet with sentries is vurrently bogus in multiple ways
-    # and we can get juju status ourselves -- vila 2013-12-18
-    depl = amulet.Deployment(sentries=False)
-    jd_path = os.path.join(root_dir, 'juju-deployer', 'ppa-assigner.yaml')
-    with open(jd_path) as f:
-        jd_script = yaml.safe_load(f.read())
-    # Override the juju env provided by ppa-assigner or amulet gets confused
-    script = {depl.juju_env: jd_script.values()[0]}
-    depl.load(script)
-    # This is a no-op if (as expected) the ppa-assigner has already been
-    # deployed, but it *will* be deployed if needed anyway.
-    depl.setup()
-
-    status = amulet.waiter.status(depl.juju_env)
-    units = status['services']['django']['units']
-    ip = units['django/0']['public-address']
-    port, _ = units['django/0']['open-ports'][0].split('/')
-    # Issue a simple command against the ppa assigner API
-    url = 'http://{}:{}/api/v1/ppa'.format(ip, port)
-    client = httplib2.Http()
-    resp, content = client.request(url, 'GET')
-    jcontent = json.loads(content)
-    # Target
-    # self.assertEqual('200', resp['status'])
-    # self.assertNotEqual([], jcontent['objects'])
-    if '200' != resp['status']:
-        sys.exit(1)
-    if [] == jcontent['objects']:
-        sys.exit(2)
+
+class AmuletDeployment(fixtures.Fixture):
+    """Fixture for a deployed set of juju services from a deployer config"""
+
+    def __init__(self, deployer_cfg, juju_env=None, sentries=False):
+        self.deployment = amulet.Deployment(juju_env, sentries=sentries)
+        with open(deployer_cfg) as f:
+            jd_script = yaml.safe_load(f.read())
+        # Use juju_env given or defaulted above rather than taking the name
+        # from the deployer config and assuming an env of that name exists
+        script = {self.deployment.juju_env: jd_script.values()[0]}
+        self.deployment.load(script)
+
+    def setUp(self):
+        super(AmuletDeployment, self).setUp()
+        self.deployment.setup()
+
+
+class PPAAssignerTest(fixtures.TestWithFixtures):
+    """Integration tests for ppa-assigner service run on a juju deployment"""
+
+    @staticmethod
+    def _get_deployer_cfg():
+        return os.path.join(root_dir, 'juju-deployer', 'ppa-assigner.yaml')
+
+    def setUp(self):
+        super(PPAAssignerTest, self).setUp()
+        self.deployer_fixture = AmuletDeployment(self._get_deployer_cfg())
+
+    def get_ip_and_port(self):
+        status = amulet.waiter.status(self.deployer_fixture.deployment.juju_env)
+        units = status['services']['django']['units']
+        ip = units['django/0']['public-address']
+        port, _ = units['django/0']['open-ports'][0].split('/')
+        return ip, port
+
+    def test_ppa_api(self):
+        self.useFixture(self.deployer_fixture)
+
+        url = 'http://{}:{}/api/v1/ppa'.format(*self.get_ip_and_port())
+
+        # Issue a simple command against the ppa assigner API
+        client = httplib2.Http()
+        resp, content = client.request(url, 'GET')
+        jcontent = json.loads(content)
+        self.assertEqual('200', resp['status'])
+        self.assertNotEqual([], jcontent['objects'])
 
 
 if __name__ == "__main__":
-    main()
+    unittest.main()