Merge lp:~elopio/ubuntu-system-settings-online-accounts/launch_fixture into lp:ubuntu-system-settings-online-accounts

[Leo Arias]

Moved the launcher to a fixture so it can be reused outside of the testcase.

[Víctor R. Ruiz (vrruiz)]

Overall, looks good to me. Needs fixing: Classes and methods need docstrings. And the name of the class (LaunchBinaryOnlineAccountsUI) conflicts with the one used in /tests/__init__.py (LaunchOnlineAccountsUI).

review: Needs Fixing

[lp:~elopio/ubuntu-system-settings-online-accounts/launch_fixture]

136. By Leo Arias on 2014-07-11

Added a comment.

137. By Leo Arias on 2014-07-11

Added a comment.

138. By Leo Arias on 2014-07-11

Fixed the online accounts ui fixture name.

[Leo Arias (elopio)]

> Overall, looks good to me. Needs fixing: Classes and methods need docstrings.

Added.

> And the name of the class (LaunchBinaryOnlineAccountsUI) conflicts with the
> one used in /tests/__init__.py (LaunchOnlineAccountsUI).

Good catch, I forgot to update it there.

Thanks.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2984
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2984/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9719

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/139/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-i386-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9727

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/140/rebuild

review: Approve (continuous-integration)

Unmerged revisions

138. By Leo Arias on 2014-07-11

Fixed the online accounts ui fixture name.

137. By Leo Arias on 2014-07-11

Added a comment.

136. By Leo Arias on 2014-07-11

Added a comment.

135. By Leo Arias on 2014-07-11

Moved the launcher to a fixture so it can be reused outside of the testcase.

=== added file 'tests/autopilot/online_accounts_ui/fixture_setup.py'
--- tests/autopilot/online_accounts_ui/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/online_accounts_ui/fixture_setup.py	2014-07-11 17:55:32 +0000
@@ -0,0 +1,57 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This file is part of ubuntu-system-settings-online-accounts.
+#
+# ubuntu-system-settings-online-accounts is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; version 3.
+#
+# ubuntu-system-settings-online-accounts is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+import time
+
+import fixtures
+import ubuntuuitoolkit
+from autopilot import application
+
+
+class LaunchBinaryOnlineAccountsUI(fixtures.Fixture):
+
+    """Fixture to launch the Online Accounts UI using the installed binary."""
+
+    def setUp(self):
+        """Launch the application when the fixture is used."""
+        super().setUp()
+        self.application_proxy = self._launch_application()
+
+    def _launch_application(self):
+        # Increase the timeout of online-accounts-ui, to make sure it won't
+        # quit before the system settings panel asks it to open.
+        self.useFixture(
+            fixtures.EnvironmentVariable('OAU_DAEMON_TIMEOUT', '120'))
+        base_class = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
+        application_launcher = self.useFixture(
+            application.NormalApplicationLauncher(
+                emulator_base=base_class)
+            )
+        application_proxy = application_launcher.launch(
+            'online-accounts-ui',
+            '--desktop_file_hint='
+            '/usr/share/applications/online-accounts-ui.desktop',
+            app_type='qt', capture_output=True)
+        system_settings = subprocess.Popen(
+            ['system-settings', 'online-accounts',
+             '--desktop_file_hint='
+             '/usr/share/applications/ubuntu-system-settings.desktop'])
+        self.addCleanup(system_settings.terminate)
+        time.sleep(1)
+        return application_proxy

=== modified file 'tests/autopilot/online_accounts_ui/tests/__init__.py'
--- tests/autopilot/online_accounts_ui/tests/__init__.py	2014-07-03 08:17:37 +0000
+++ tests/autopilot/online_accounts_ui/tests/__init__.py	2014-07-11 17:55:32 +0000
@@ -16,16 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import fixtures
-import subprocess
-import time
-
 import ubuntuuitoolkit
 from autopilot import platform
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
 import online_accounts_ui
+from online_accounts_ui import fixture_setup
 
 
 class BaseOnlineAccountsUITestCase(
@@ -37,28 +34,9 @@
         if platform.model() != 'Desktop':
             self.skipTest('Skip because of bug http://pad.lv/1252294')
 
-        application_proxy = self.launch_application()
+        launch_application = fixture_setup.LaunchBinaryOnlineAccountsUI()
+        self.useFixture(launch_application)
         self.application = online_accounts_ui.OnlineAccountsUI(
-            application_proxy)
+            launch_application.application_proxy)
         self.assertThat(
             self.application.main_view.visible, Eventually(Equals(True)))
-
-    def launch_application(self):
-        # Increase the timeout of online-accounts-ui, to make sure it won't
-        # quit before the system settings panel asks it to open.
-        self.useFixture(
-            fixtures.EnvironmentVariable('OAU_DAEMON_TIMEOUT', '120'))
-        application = self.launch_test_application(
-            'online-accounts-ui',
-            '--desktop_file_hint='
-            '/usr/share/applications/online-accounts-ui.desktop',
-            app_type='qt',
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
-            capture_output=True)
-        system_settings = subprocess.Popen(
-            ['system-settings', 'online-accounts',
-             '--desktop_file_hint='
-             '/usr/share/applications/ubuntu-system-settings.desktop'])
-        self.addCleanup(system_settings.terminate)
-        time.sleep(1)
-        return application