Merge lp:~vila/uci-engine/1323498-fix-unit-renames into lp:uci-engine

[Vincent Ladeuil]

Fix test failures introduced while renaming the services in an IS compatible way.

This fixes the fallout from revno 506: tests were referring to the old service names without the introduced 'ci-airline-' prefix.

I'm waiting for a test run to complete but I think I've got all references fixed.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

review: Approve

=== modified file 'tests/test_image_builder.py'
--- tests/test_image_builder.py	2014-04-17 20:13:11 +0000
+++ tests/test_image_builder.py	2014-05-27 10:32:39 +0000
@@ -21,14 +21,15 @@
 import deployers
 
 
-class TestTestRunner(deployers.DeployerTest):
+class TestImageBuilder(deployers.DeployerTest):
     """Integration tests for image builder service run on a juju deployment"""
 
     deployer_cfg = 'image-builder.yaml'
 
     def test_worker_running(self):
         '''ensure the rabbit worker is deployed and running'''
-        self.assert_job_running('imagebuild_worker', 'imagebuild-worker')
+        self.assert_job_running('ci_airline_imagebuild_worker',
+                                'ci-airline-imagebuild-worker')
 
 
 if __name__ == "__main__":
 
=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2014-05-07 14:41:07 +0000
+++ tests/test_integration.py	2014-05-27 10:32:39 +0000
@@ -72,7 +72,7 @@
         args = '%s develop' % p
         run_virtual_env(self.temp_dir, args)
         config_url = 'http://{}'.format(
-            self.get_ip_and_port('webui-apache')[0])
+            self.get_ip_and_port('ci-airline-webui-apache')[0])
         config = os.path.join(os.environ["HOME"], '.ubuntu-ci')
         with open(config, 'a') as fp:
             fp.write('ci_url: "{}"\n'.format(config_url))
@@ -80,7 +80,8 @@
         run_virtual_env(self.temp_dir, args='create')
         self.addCleanup(delete_virtual_env, self.temp_dir)
 
-    def get_server_status_and_content(self, url, service='webui-apache'):
+    def get_server_status_and_content(self, url,
+                                      service='ci-airline-webui-apache'):
         final_url = url.format(self.get_ip_and_port(service)[0])
 
         client = httplib2.Http()
 
=== modified file 'tests/test_juju_gui.py'
--- tests/test_juju_gui.py	2014-05-12 18:48:34 +0000
+++ tests/test_juju_gui.py	2014-05-27 10:32:39 +0000
@@ -29,7 +29,7 @@
     def get_unit(self):
         status = amulet.waiter.status(
             self.deployer.deployment.juju_env)
-        unit = status['services']['ci-juju-gui']['units'].values()[0]
+        unit = status['services']['ci-airline-juju-gui']['units'].values()[0]
         return unit
 
     def test_juju_gui(self):
 
=== modified file 'tests/test_ppa_assigner.py'
--- tests/test_ppa_assigner.py	2014-04-16 18:36:03 +0000
+++ tests/test_ppa_assigner.py	2014-05-27 10:32:39 +0000
@@ -29,7 +29,7 @@
     deployer_cfg = 'ppa-assigner.yaml'
 
     def get_server_status_and_content(self, url):
-        final_url = url.format(*self.get_ip_and_port('ppa-django'))
+        final_url = url.format(*self.get_ip_and_port('ci-airline-ppa-django'))
 
         # Issue a simple command against the ppa assigner API
         client = httplib2.Http()
@@ -39,7 +39,7 @@
 
     def reserve_ppa(self, ticket_id):
         url = 'http://{}:{}/api/v1/ppa/'
-        final_url = url.format(*self.get_ip_and_port('ppa-django'))
+        final_url = url.format(*self.get_ip_and_port('ci-airline-ppa-django'))
 
         client = httplib2.Http()
         resp, content = client.request(
 
=== modified file 'tests/test_test_runner.py'
--- tests/test_test_runner.py	2014-04-17 20:13:11 +0000
+++ tests/test_test_runner.py	2014-05-27 10:32:39 +0000
@@ -26,7 +26,8 @@
 
     def test_worker_running(self):
         '''Ensure the rabbit worker is deployed and running.'''
-        self.assert_job_running('tr_rabbit_worker', 'tr-rabbit-worker')
+        self.assert_job_running('ci_airline_tr_rabbit_worker',
+                                'ci-airline-tr-rabbit-worker')
 
 
 if __name__ == "__main__":
 
=== modified file 'tests/test_ticket_system.py'
--- tests/test_ticket_system.py	2014-05-26 12:51:46 +0000
+++ tests/test_ticket_system.py	2014-05-27 10:32:39 +0000
@@ -32,7 +32,7 @@
         # Adding get_ip_and_port('ts-django') in order to allow the deployment
         # further time to settle before running the tests.
         # http://pad.lv/1319077
-        self.get_ip_and_port('ts-django')
+        self.get_ip_and_port('ci-airline-ts-django')
 
     def get_server_status_and_content(self, url):
         final_url = url.format(self.get_ip_and_port('webui-apache')[0])
@@ -45,7 +45,8 @@
 
     def create_ticket(self, ticket_content):
         url = 'http://{}/api/v1/ticket/'
-        final_url = url.format(self.get_ip_and_port('webui-apache')[0])
+        final_url = url.format(
+            self.get_ip_and_port('ci-airline-webui-apache')[0])
 
         client = httplib2.Http()
         resp, content = client.request(
@@ -58,7 +59,7 @@
 
     def test_ticket_sys_api(self):
         url = 'http://{}/api/v1/ticket'
-        self.get_ip_and_port('ts-django')
+        self.get_ip_and_port('ci-airline-ts-django')
         resp, content = self.get_server_status_and_content(url)
 
         self.assertEqual('200', resp['status'])