Merge lp:~cprov/uci-engine/integration-tests-tweaks into lp:uci-engine

[Celso Providelo]

CLI end2end integration test fix.

CLI end2end integration test fix.

Including independent webui deployment configuration and relations.

[Chris Johnston (cjohnston)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:553
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/815/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/815/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2014-06-06 14:55:22 +0000
+++ tests/test_integration.py	2014-06-10 12:25:30 +0000
@@ -61,7 +61,7 @@
 class IntegrationTest(deployers.DeployerTest):
     """Integration tests for ticket-system service run on a juju deployment"""
 
-    deployer_cfgs = ['ticket-system.yaml', 'gatekeeper.yaml']
+    deployer_cfgs = ['gatekeeper.yaml', 'ticket-system.yaml', 'webui.yaml']
 
     def setUp(self):
         super(IntegrationTest, self).setUp()
@@ -88,14 +88,17 @@
         self.addCleanup(delete_virtual_env, self.temp_dir)
 
     def add_extra_relations(self, script):
-        """Hook gatekeeper to the webui."""
+        """Hook gatekeeper and the ticket system to the webui."""
         relations = script['ci-airline']['relations']
         relations.append(
             ['ci-airline-gatekeeper-restish:json_status',
-             'ci-airline-webui-app:json_status'])
+             'ci-airline-webui-health:json_status'])
         relations.append(
             ['ci-airline-gatekeeper-restish:website',
              'ci-airline-webui-apache:reverseproxy'])
+        relations.append(
+            ['ci-airline-ts-django:website',
+             'ci-airline-webui-apache:reverseproxy'])
 
     def get_server_status_and_content(self, url,
                                       service='ci-airline-webui-apache'):