Merge lp:~canonical-platform-qa/autopilot/fix-zesty-build into lp:autopilot

[Richard Huddie]

Fix zesty package building.

Use a mocked UbuntuAppLaunch during unit tests to stop the reported errors during self tests in package building on zesty.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:596
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/179/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/9
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/9/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/9
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/9/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2318/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/179/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Excellent! I see it makes the trunk buildable again - could we get it reviewed and merged? I could then follow up with my dep-change. Would have to release both then though to the archive...

[Richard Huddie (rhuddie)]

> Excellent! I see it makes the trunk buildable again - could we get it reviewed
> and merged? I could then follow up with my dep-change. Would have to release
> both then though to the archive...

I'm just waiting to get someone to review it. Should be fine as its only unit test update. We'll do a combined release of this plus the dep removal mp.

[Santiago Baldassin (sbaldassin)]

Code looks good

review: Approve

=== modified file 'autopilot/tests/unit/test_application_launcher.py'
--- autopilot/tests/unit/test_application_launcher.py	2017-03-01 23:11:40 +0000
+++ autopilot/tests/unit/test_application_launcher.py	2017-04-04 18:50:39 +0000
@@ -631,9 +631,10 @@
         loop = UpstartApplicationLauncher._get_glib_loop()
         self.assertThat(loop, IsInstance(GLib.MainLoop))
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_handle_string(self, _):
+    def test_handle_string(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         token_a = self.getUniqueString()
         token_b = self.getUniqueString()
@@ -643,9 +644,10 @@
                     launcher.launch(token_a, token_b)
                     la.assert_called_once_with(token_a, [token_b])
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_handle_bytes(self, _):
+    def test_handle_bytes(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         token_a = self.getUniqueString()
         token_b = self.getUniqueString()
@@ -655,9 +657,10 @@
                     launcher.launch(token_a, token_b.encode())
                     la.assert_called_once_with(token_a, [token_b])
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_handle_list(self, _):
+    def test_handle_list(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         token_a = self.getUniqueString()
         token_b = self.getUniqueString()
@@ -667,9 +670,10 @@
                     launcher.launch(token_a, [token_b])
                     la.assert_called_once_with(token_a, [token_b])
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_calls_get_pid(self, _):
+    def test_calls_get_pid(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         token = self.getUniqueString()
         with patch.object(launcher, '_launch_app'):
@@ -678,9 +682,10 @@
                     launcher.launch(token)
                     gp.assert_called_once_with(token)
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_gets_correct_proxy_object(self, gpofep):
+    def test_gets_correct_proxy_object(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         with patch.object(launcher, '_launch_app'):
             with patch.object(launcher, '_get_pid_for_launched_app') as gp:
@@ -690,9 +695,10 @@
                                                    emulator_base=None,
                                                    dbus_bus='session')
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_returns_proxy_object(self, gpofep):
+    def test_returns_proxy_object(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         with patch.object(launcher, '_launch_app'):
             with patch.object(launcher, '_get_pid_for_launched_app'):
@@ -700,9 +706,10 @@
                     result = launcher.launch('')
                     self.assertEqual(result, gpofep.return_value)
 
+    @patch('autopilot.application._launcher.UbuntuAppLaunch')
     @patch('autopilot.application._launcher.'
            'get_proxy_object_for_existing_process')
-    def test_calls_get_glib_loop(self, gpofep):
+    def test_calls_get_glib_loop(self, gpofep, ual):
         launcher = UpstartApplicationLauncher()
         with patch.object(launcher, '_launch_app'):
             with patch.object(launcher, '_get_pid_for_launched_app'):