Merge lp:~cprov/uci-engine/ppa-creator-fix into lp:uci-engine

[Celso Providelo]

Fix ppacreator by restoring the implicit logger name setter removed in the previous rev.

Fix ppacreator by restoring the implicit logger name setter removed in the previous rev.

Adding a basic integration test to block similar problems in the future.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:786
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1409/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[lp:~cprov/uci-engine/ppa-creator-fix]

787. By Celso Providelo on 2014-09-17

Fixing broken test.

[Paul Larson (pwlars)]

That should do it, +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:787
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1411/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Joe Talbott (joetalbott)]

+1

review: Approve

=== modified file 'ppa-creator/ppacreator/run_worker.py'
--- ppa-creator/ppacreator/run_worker.py	2014-09-16 13:09:07 +0000
+++ ppa-creator/ppacreator/run_worker.py	2014-09-17 20:00:52 +0000
@@ -26,6 +26,9 @@
 
 class PPACreatorWorker(amqp_worker.AMQPWorker):
 
+    def __init__(self):
+        super(PPACreatorWorker, self).__init__('ppacreator')
+
     def handle_request(self, params, log):
         name = params['name']
         displayname = params['displayname']
 
=== modified file 'ppa-creator/ppacreator/tests/test_worker.py'
--- ppa-creator/ppacreator/tests/test_worker.py	2014-09-15 09:32:17 +0000
+++ ppa-creator/ppacreator/tests/test_worker.py	2014-09-17 20:00:52 +0000
@@ -23,7 +23,7 @@
 
     def setUp(self):
         super(TestPPACreatorWorker, self).setUp()
-        self.worker = run_worker.PPACreatorWorker('ppacreator')
+        self.worker = run_worker.PPACreatorWorker()
 
     @mock.patch('ppacreator.run_worker.create_ppa')
     @mock.patch('ci_utils.amqp_utils.progress_completed')
 
=== added file 'tests/test_ppacreator.py'
--- tests/test_ppacreator.py	1970-01-01 00:00:00 +0000
+++ tests/test_ppacreator.py	2014-09-17 20:00:52 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# Ubuntu Continuous Integration Engine
+# Copyright 2014 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+
+import unittest
+import deployers
+
+
+class TestPPACreator(deployers.DeployerTest):
+    """Integration tests for ppacreator service run on a juju deployment"""
+
+    def test_worker_running(self):
+        """Ensure the ppacreator worker is deployed and running."""
+        self.assert_job_running('ci-airline-ppa-creator-worker')
+
+
+if __name__ == "__main__":
+    unittest.main()