Merge lp:~elopio/ubuntuone-credentials/python3 into lp:ubuntuone-credentials

[Leo Arias]

Ported the autopilot tests to python3.
Refactored and updated the tests to use new helpers and to be more consistent with the rest of packages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/89/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-05-13 08:28:24 +0000
+++ debian/control	2014-06-29 09:58:30 +0000
@@ -11,7 +11,7 @@
  qtbase5-dev,
  qtdeclarative5-dev,
  qtdeclarative5-ubuntu-ui-toolkit-plugin,
- python (>= 2.7),
+ python3-all,
  signon-plugins-dev,
  ubuntu-ui-toolkit-autopilot,
  xvfb,
@@ -42,9 +42,9 @@
 Architecture: all
 Depends:
  libautopilot-qt (>= 1.4),
- python-autopilot,
- python-fixtures,
- python-testtools,
+ python3-autopilot,
+ python3-fixtures,
+ python3-testtools,
  qtdeclarative5-online-accounts-client0.1,
  qtdeclarative5-qtquick2-plugin,
  qtdeclarative5-test-plugin,

=== modified file 'online-accounts-provider/tests/CMakeLists.txt'
--- online-accounts-provider/tests/CMakeLists.txt	2014-01-30 18:46:46 +0000
+++ online-accounts-provider/tests/CMakeLists.txt	2014-06-29 09:58:30 +0000
@@ -3,13 +3,13 @@
 set (AUTOPILOT_PACKAGE ubuntuone_credentials)
 
 add_custom_target(online-accounts-provider-autopilot-tests
-    COMMAND autopilot run ${AUTOPILOT_PACKAGE}
+    COMMAND autopilot3 run ${AUTOPILOT_PACKAGE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/autopilot
     DEPENDS ${QML_PLUGIN_NAME}
 )
 
 add_custom_target(online-accounts-provider-autopilot-tests-local
-    COMMAND SSO_AUTH_BASE_URL=fake SSO_UONE_BASE_URL=fake autopilot run ${AUTOPILOT_PACKAGE}
+    COMMAND SSO_AUTH_BASE_URL=fake SSO_UONE_BASE_URL=fake autopilot3 run ${AUTOPILOT_PACKAGE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/autopilot
     DEPENDS ${QML_PLUGIN_NAME}
 )
@@ -18,13 +18,12 @@
     COMMAND qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/unit
 )
 
-set (Python_ADDITIONAL_VERSIONS 2.7)
 find_package (PythonInterp)
 
 set (AUTOPILOT_DIR autopilot/ubuntuone_credentials)
 
 execute_process (
-  COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib()"
+  COMMAND python3 -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"
   COMMAND sed -r -e "s|^/usr/(local/)?||g"
   OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 

=== renamed file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/emulators.py' => 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/emulators.py	2013-10-25 21:53:34 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py	2014-06-29 09:58:30 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013-2014 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3, as published
@@ -14,13 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from autopilot import input
-
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-
-class NewAccount(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
-    """New Account Autopilot emulator."""
+import ubuntuuitoolkit
+
+
+class NewAccount(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """New Account Autopilot helper."""
 
     def is_error_label_visible(self):
         error_label = self.select_single(objectName='errorLabel')
@@ -32,7 +31,7 @@
 
     def enter_twofactor_code(self, twoFactorCode):
         two_factor_text_field = self.select_single(
-            TextField, objectName='twoFactorTextField')
+            ubuntuuitoolkit.TextField, objectName='twoFactorTextField')
         two_factor_text_field.write(twoFactorCode)
         self._click_continue()
 
@@ -42,12 +41,12 @@
 
     def _enter_email(self, email):
         email_text_field = self.select_single(
-            TextField, objectName='emailTextField')
+            ubuntuuitoolkit.TextField, objectName='emailTextField')
         email_text_field.write(email)
 
     def _enter_login_password(self, password):
         password_text_field = self.select_single(
-            TextField, objectName='loginFormPasswordTextField')
+            ubuntuuitoolkit.TextField, objectName='loginFormPasswordTextField')
         password_text_field.write(password)
 
     def _click_continue(self):
@@ -67,48 +66,29 @@
 
     def _switch_to_new_account(self):
         new_user_switch = self.select_single(
-            toolkit_emulators.CheckBox, objectName='newUserToggleSwitch')
+            ubuntuuitoolkit.CheckBox, objectName='newUserToggleSwitch')
         new_user_switch.check()
 
     def _enter_name(self, name):
         name_text_field = self.select_single(
-            TextField, objectName='nameTextField')
+            ubuntuuitoolkit.TextField, objectName='nameTextField')
         name_text_field.write(name)
 
     def _enter_password_new_user(self, password):
         password_text_field = self.select_single(
-            TextField, objectName='passwordTextField')
+            ubuntuuitoolkit.TextField, objectName='passwordTextField')
         password_text_field.write(password)
 
     def _enter_password_confirmation(self, password_confirmation):
         confirm_password_text_field = self.select_single(
-            TextField, objectName='confirmPasswordTextField')
+            ubuntuuitoolkit.TextField, objectName='confirmPasswordTextField')
         confirm_password_text_field.write(password_confirmation)
 
     def _agree_to_terms(self, agree):
         terms_and_conditions_check_box = self.select_single(
-            toolkit_emulators.CheckBox,
+            ubuntuuitoolkit.CheckBox,
             objectName='termsAndConditionsCheckBox')
         if agree:
             terms_and_conditions_check_box.check()
         else:
             terms_and_conditions_check_box.uncheck()
-
-
-class TextField(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
-    """TextField Autopilot emulator."""
-    # TODO change this to use the text field emulator, once it lands on
-    # ubuntu-ui-toolkit. --elopio - 2013-10-08
-
-    def __init__(self, *args):
-        super(TextField, self).__init__(*args)
-        self.keyboard = input.Keyboard.create()
-
-    def write(self, text):
-        """Write into the text field.
-
-        :parameter text: The text to write.
-
-        """
-        self.pointing_device.click_object(self)
-        self.keyboard.type(text)

=== renamed file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py' => 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/base.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py	2014-01-24 15:43:27 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/base.py	2014-06-29 09:58:30 +0000
@@ -21,14 +21,10 @@
 import tempfile
 
 import fixtures
+import ubuntuuitoolkit
 from autopilot import input
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from ubuntuuitoolkit import (
-    base,
-    emulators as toolkit_emulators,
-    tests as toolkit_tests
-)
 
 from ubuntuone_credentials import fixture_setup
 
@@ -43,7 +39,7 @@
             os.path.dirname(__file__), '..', '..', '..'))
 
 
-class TestCaseWithQMLWrapper(base.UbuntuUIToolkitAppTestCase):
+class TestCaseWithQMLWrapper(ubuntuuitoolkit.base.UbuntuUIToolkitAppTestCase):
 
     _DESKTOP_FILE_CONTENTS = ("""[Desktop Entry]
 Type=Application
@@ -71,7 +67,8 @@
 
     def use_qml2_import_path_for_fake_wrapper(self):
         arch = subprocess.check_output(
-            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
+            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
+            universal_newlines=True).strip()
         system_settings_path = (
             '/usr/lib/{}/ubuntu-system-settings/private'.format(arch))
         qml_credentials_path = os.path.join(
@@ -86,26 +83,27 @@
         desktop_file_path = self._write_test_desktop_file()
         self.addCleanup(os.remove, desktop_file_path)
         self.app = self.launch_test_application(
-            base.get_qmlscene_launch_command(),
+            ubuntuuitoolkit.base.get_qmlscene_launch_command(),
             '-I' + _get_module_include_path(),
             qml_file_path,
             '--desktop_file_hint={0}'.format(desktop_file_path),
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
             app_type='qt')
 
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
     def _write_test_desktop_file(self):
-        desktop_file_dir = toolkit_tests.get_local_desktop_file_directory()
+        desktop_file_dir = (
+            ubuntuuitoolkit.tests.get_local_desktop_file_directory())
         if not os.path.exists(desktop_file_dir):
             os.makedirs(desktop_file_dir)
         desktop_file = tempfile.NamedTemporaryFile(
-            suffix='.desktop', dir=desktop_file_dir, delete=False)
+            mode='w+t', suffix='.desktop', dir=desktop_file_dir, delete=False)
         desktop_file.write(self._DESKTOP_FILE_CONTENTS)
         desktop_file.close()
         return desktop_file.name
 
     @property
     def main_view(self):
-        return self.app.select_single(toolkit_emulators.MainView)
+        return self.app.select_single(ubuntuuitoolkit.MainView)

=== modified file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/fake_servers.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/fake_servers.py	2014-01-27 06:30:26 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/fake_servers.py	2014-06-29 09:58:30 +0000
@@ -14,23 +14,23 @@
 # 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 BaseHTTPServer
+import http.server
 import json
 import logging
-import urlparse
+import urllib.parse
 
 
 logger = logging.getLogger(__name__)
 
 
-class FakeSSOAndU1Server(BaseHTTPServer.HTTPServer, object):
+class FakeSSOAndU1Server(http.server.HTTPServer, object):
 
     def __init__(self, server_address):
         super(FakeSSOAndU1Server, self).__init__(
             server_address, FakeSSOAndU1RequestHandler)
 
 
-class FakeSSOAndU1RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class FakeSSOAndU1RequestHandler(http.server.BaseHTTPRequestHandler):
 
     SSO_API_PATH = '/api/v2'
 
@@ -85,8 +85,8 @@
 
     def do_GET(self):
         """Handle GET as if we were the one.ubuntu.com server."""
-        parsed_path = urlparse.urlparse(self.path)
-        query_dict = urlparse.parse_qs(parsed_path.query)
+        parsed_path = urllib.parse.urlparse(self.path)
+        query_dict = urllib.parse.parse_qs(parsed_path.query)
 
         if parsed_path.path.startswith('/oauth/sso-finished-so-get-tokens/'):
             self._handle_get_tokens(query_dict)
@@ -103,12 +103,13 @@
         else:
             self.send_response(200)
             self.end_headers()
-            self.wfile.write("ok 0/0")  # fake format of server's real response
+            # fake format of server's real response
+            self.wfile.write("ok 0/0".encode())
 
     def do_POST(self):
         """Handle POST as if we are the login.ubuntu.com server."""
         length = int(self.headers['Content-Length'])
-        post_data = self.rfile.read(length)
+        post_data = self.rfile.read(length).decode('utf-8')
         if post_data == '':
             logger.debug('NOTE: empty post data, just dropping the request.')
         else:
@@ -136,7 +137,7 @@
         self.send_response(code)
         self.send_header('Content-Type', 'application/json')
         self.end_headers()
-        self.wfile.write(reply_json)
+        self.wfile.write(reply_json.encode())
 
     def _handle_login(self, body_dict):
         if ('email' not in body_dict or 'password' not in body_dict or

=== modified file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_existing_account.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_existing_account.py	2014-01-24 15:43:27 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_existing_account.py	2014-06-29 09:58:30 +0000
@@ -19,10 +19,10 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-import ubuntuone_credentials
-
-
-class ExistingUOAAccountTestCase(ubuntuone_credentials.TestCaseWithQMLWrapper):
+from ubuntuone_credentials import base
+
+
+class ExistingUOAAccountTestCase(base.TestCaseWithQMLWrapper):
 
     test_qml_wrapper_file_name = 'TestWrapperExisting.qml'
 

=== modified file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_fixture_setup.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_fixture_setup.py	2014-01-27 06:28:01 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_fixture_setup.py	2014-06-29 09:58:30 +0000
@@ -14,8 +14,8 @@
 # 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 httplib
-import urlparse
+import http.client
+import urllib.parse
 
 import testtools
 
@@ -30,10 +30,10 @@
         self.addCleanup(self.assert_server_not_running)
         self.useFixture(fake_search_server)
 
-        self.netloc = urlparse.urlparse(fake_search_server.url).netloc
+        self.netloc = urllib.parse.urlparse(fake_search_server.url).netloc
 
     def assert_server_not_running(self):
-        connection = httplib.HTTPConnection(self.netloc)
+        connection = http.client.HTTPConnection(self.netloc)
         self.assertRaises(Exception, self.do_get_request, connection)
 
     def do_get_request(self, connection):
@@ -43,14 +43,14 @@
         connection.request('POST', '/api/v2/tokens/oauth', 'dummy body')
 
     def test_fake_sso_and_u1_server_must_accept_get_request(self):
-        connection = httplib.HTTPConnection(self.netloc)
+        connection = http.client.HTTPConnection(self.netloc)
         self.addCleanup(connection.close)
 
         self.do_get_request(connection)
         self.assertEqual(connection.getresponse().status, 401)
 
     def test_fake_sso_and_u1_server_must_accept_post_request(self):
-        connection = httplib.HTTPConnection(self.netloc)
+        connection = http.client.HTTPConnection(self.netloc)
         self.addCleanup(connection.close)
 
         self.do_post_request(connection)

=== modified file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_new_account.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_new_account.py	2014-01-24 15:43:27 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/test_new_account.py	2014-06-29 09:58:30 +0000
@@ -16,23 +16,22 @@
 
 import os
 
+import ubuntuuitoolkit
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, Not
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-from ubuntuone_credentials import (
-    emulators,
-    TestCaseWithQMLWrapper
-)
-
-
-class NewUbuntuOneOnlineAccountTestCase(TestCaseWithQMLWrapper):
+
+import ubuntuone_credentials
+from ubuntuone_credentials import base
+
+
+class NewUbuntuOneOnlineAccountTestCase(base.TestCaseWithQMLWrapper):
 
     test_qml_wrapper_file_name = 'TestWrapperNew.qml'
 
     def setUp(self):
         super(NewUbuntuOneOnlineAccountTestCase, self).setUp()
-        self.new_account = self.main_view.select_single(emulators.NewAccount)
+        self.new_account = self.main_view.select_single(
+            ubuntuone_credentials.NewAccount)
 
     def test_loading_overlay_starts_invisible(self):
         overlay = self.main_view.select_single(objectName='loadingOverlay')
@@ -55,7 +54,7 @@
 
     def test_switch_to_new_user(self):
         new_user_switch = self.main_view.select_single(
-            toolkit_emulators.CheckBox, objectName='newUserToggleSwitch')
+            ubuntuuitoolkit.CheckBox, objectName='newUserToggleSwitch')
         new_user_switch.check()
 
         password_text_field = self.main_view.select_single(
@@ -72,7 +71,7 @@
             Eventually(Equals(False)))
 
 
-class SimpleLogInTestCase(TestCaseWithQMLWrapper):
+class SimpleLogInTestCase(base.TestCaseWithQMLWrapper):
 
     test_qml_wrapper_file_name = 'TestWrapperNew.qml'
 
@@ -93,7 +92,8 @@
         """Test that success pops the NewAccount main page, and
         failure shows the error label.
         """
-        new_account = self.main_view.select_single(emulators.NewAccount)
+        new_account = self.main_view.select_single(
+            ubuntuone_credentials.NewAccount)
         new_account.log_in(email=self.email, password=self.password)
         dummyPage = self.main_view.select_single(objectName="dummyPage")
         self.assertThat(dummyPage.visible, Eventually(Equals(self.success)))
@@ -101,7 +101,7 @@
                         Eventually(Equals(not self.success)))
 
 
-class TwoFactorLogInTestCase(TestCaseWithQMLWrapper):
+class TwoFactorLogInTestCase(base.TestCaseWithQMLWrapper):
 
     test_qml_wrapper_file_name = 'TestWrapperNew.qml'
 
@@ -135,11 +135,12 @@
         # password field, which is always at the location that the
         # hidden two-factor field starts out at.
         tfn = 'twoFactorTextField'
-        two_factor_field = self.main_view.select_single(emulators.TextField,
-                                                        objectName=tfn)
+        two_factor_field = self.main_view.select_single(
+            ubuntuuitoolkit.TextField, objectName=tfn)
         saved_rect = two_factor_field.globalRect
 
-        new_account = self.main_view.select_single(emulators.NewAccount)
+        new_account = self.main_view.select_single(
+            ubuntuone_credentials.NewAccount)
         new_account.log_in(email=self.email, password=self.password)
 
         # Here we wait for both visible and focus, to ensure that the
@@ -166,7 +167,7 @@
                          success=True)
 
 
-class RegisterNewU1AccountTestCase(TestCaseWithQMLWrapper):
+class RegisterNewU1AccountTestCase(base.TestCaseWithQMLWrapper):
 
     test_qml_wrapper_file_name = 'TestWrapperNew.qml'
 
@@ -186,7 +187,8 @@
     def test_register_new_account(self):
         "Test that registering a new account pops the main page."
 
-        new_account = self.main_view.select_single(emulators.NewAccount)
+        new_account = self.main_view.select_single(
+            ubuntuone_credentials.NewAccount)
         new_account.register_new_account(self.email, self.name, self.password,
                                          self.password_confirmation,
                                          self.agree_to_terms)