Merge lp:~elopio/unity-scope-click/update_new_scopes3 into lp:unity-scope-click/devel

[Leo Arias]

Get the test_install_with_credentials_must_start_download autopilot test running.
Launch the clickscope from the build dir if it's available.
Enter the search query with the unity8 helper.
Updated to use python3.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/62/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/63/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

220 + 'updated=2014-05-15+14%3A29%3A38.679354&'
222 + 'created=2014-05-15+14%3A29%3A38.679344&'

These are not necessary to have in this string. Let's drop them to avoid unnecessary content here.

286 Depends: libautopilot-qt (>= 1.4),
299 ubuntu-ui-toolkit-autopilot,
300 unity8-autopilot,

These aren't changed in your diff, but with the conversion to python3 here, I think these dependencies also need to be updated to depend on at least the versions of them which also use python3.

review: Needs Fixing

[Leo Arias (elopio)]

> 220 + 'updated=2014-05-15+14%3A29%3A38.679354&'
> 222 + 'created=2014-05-15+14%3A29%3A38.679344&'
>
> These are not necessary to have in this string. Let's drop them to avoid
> unnecessary content here.

Done

> 286 Depends: libautopilot-qt (>= 1.4),
> 299 ubuntu-ui-toolkit-autopilot,
> 300 unity8-autopilot,
>
> These aren't changed in your diff, but with the conversion to python3 here, I
> think these dependencies also need to be updated to depend on at least the
> versions of them which also use python3.

<elopio> dobey: dpkg-architecture -c sets the environment variable $DEB_HOST_MULTIARCH for the command passed as argument.
<elopio> ubuntu-ui-toolkit-autopilot and unity8-autopilot work with py2 and py3 for now. As soon as possible, the py2 support will be dropped.
<elopio> but they don't have a py3 specific version.
<dobey> elopio: the versions in trusty too?
<elopio> dobey: yes.
<elopio> I haven't ran all the tests in trusty yet, as I plan to enable them only on utopic for now.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/64/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-autolanding/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-autolanding/19
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-autolanding/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-autolanding/19

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'HACKING'
--- HACKING	2014-05-16 17:20:07 +0000
+++ HACKING	2014-05-16 17:20:07 +0000
@@ -38,6 +38,12 @@
     $ make check-valgrind
 
 
+Running the autopilot tests
+---------------------------
+
+    $ make test-click-scope-autopilot-fake-servers
+
+
 Running the scope
 -----------------
 

=== modified file 'autopilot/CMakeLists.txt'
--- autopilot/CMakeLists.txt	2014-02-06 17:15:05 +0000
+++ autopilot/CMakeLists.txt	2014-05-16 17:20:07 +0000
@@ -13,7 +13,7 @@
   DESTINATION ${PYTHON_PACKAGE_DIR}
 )
 
-add_custom_target(test-click-scope-autopilot-local
-    COMMAND U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake autopilot run ${AUTOPILOT_DIR}
+add_custom_target(test-click-scope-autopilot-fake-servers
+    COMMAND U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

=== modified file 'autopilot/unityclickscope/fake_servers.py'
--- autopilot/unityclickscope/fake_servers.py	2014-02-01 12:31:42 +0000
+++ autopilot/unityclickscope/fake_servers.py	2014-05-16 17:20:07 +0000
@@ -14,28 +14,28 @@
 # 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 copy
+import http.server
 import json
 import os
 import tempfile
-import urlparse
-
-
-class BaseFakeHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+import urllib.parse
+
+
+class BaseFakeHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
 
     def send_json_reply(self, code, reply_json):
         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 send_file(self, file_path, send_body=True, extra_headers={}):
         with open(file_path) as file_:
             data = file_.read()
             self.send_response(200)
             self.send_header('Content-Length', str(len(data)))
-            for key, value in extra_headers.iteritems():
+            for key, value in extra_headers.items():
                 self.send_header(key, value)
             self.end_headers()
             if send_body:
@@ -45,7 +45,7 @@
         self.send_file(file_path, send_body=False, extra_headers=extra_headers)
 
 
-class FakeSearchServer(BaseHTTPServer.HTTPServer, object):
+class FakeSearchServer(http.server.HTTPServer, object):
 
     def __init__(self, server_address):
         super(FakeSearchServer, self).__init__(
@@ -102,7 +102,7 @@
     }
 
     def do_GET(self):
-        parsed_path = urlparse.urlparse(self.path)
+        parsed_path = urllib.parse.urlparse(self.path)
         if parsed_path.path.startswith(self._SEARCH_PATH):
             self.send_json_reply(200, self._get_fake_search_response())
         elif parsed_path.path.startswith('/extra/'):
@@ -131,7 +131,7 @@
             raise NotImplementedError(package)
 
 
-class FakeDownloadServer(BaseHTTPServer.HTTPServer, object):
+class FakeDownloadServer(http.server.HTTPServer, object):
 
     def __init__(self, server_address):
         super(FakeDownloadServer, self).__init__(
@@ -141,7 +141,7 @@
 class FakeDownloadRequestHandler(BaseFakeHTTPRequestHandler):
 
     def do_HEAD(self):
-        parsed_path = urlparse.urlparse(self.path)
+        parsed_path = urllib.parse.urlparse(self.path)
         if parsed_path.path.startswith('/download/'):
             self._send_dummy_file_headers(parsed_path.path[10:])
         else:
@@ -156,7 +156,7 @@
     def _make_dummy_file(self, name):
         dummy_file = tempfile.NamedTemporaryFile(
             prefix='dummy', suffix='.click', delete=False)
-        dummy_file.write('Dummy click file.')
-        dummy_file.write(name)
+        dummy_file.write('Dummy click file.'.encode())
+        dummy_file.write(name.encode())
         dummy_file.close()
         return dummy_file.name

=== modified file 'autopilot/unityclickscope/test_click_scope.py'
--- autopilot/unityclickscope/test_click_scope.py	2014-05-13 05:52:34 +0000
+++ autopilot/unityclickscope/test_click_scope.py	2014-05-16 17:20:07 +0000
@@ -15,14 +15,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import os
+import shutil
 import subprocess
-import os
 
 import dbusmock
 import fixtures
 from autopilot.introspection import dbus as autopilot_dbus
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, MatchesAny
+from testtools.matchers import Equals
 from unity8 import process_helpers
 from unity8.shell import tests as unity_tests
 from unity8.shell.emulators import dash
@@ -106,15 +107,40 @@
     def _restart_scope(self):
         logging.info('Restarting click scope.')
         os.system('pkill -f -9 clickscope.ini')
-        lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'
-        scoperunner_path = os.path.join(lib_path, 'unity-scopes/scoperunner')
-        clickscope_config_ini_path = os.path.join(
-            lib_path, 'unity-scopes/clickscope/clickscope.ini')
         os.system(
             "dpkg-architecture -c "
             "'{scoperunner} \"\" {clickscope}' &".format(
-                scoperunner=scoperunner_path,
-                clickscope=clickscope_config_ini_path))
+                scoperunner=self._get_scoperunner_path(),
+                clickscope=self._get_scope_ini_path()))
+
+    def _get_scoperunner_path(self):
+        return os.path.join(
+            self._get_installed_unity_scopes_lib_dir(), 'scoperunner')
+
+    def _get_installed_unity_scopes_lib_dir(self):
+        return os.path.join('/usr/lib/$DEB_HOST_MULTIARCH/', 'unity-scopes')
+
+    def _get_scope_ini_path(self):
+        build_dir = os.environ.get('BUILD_DIR', None)
+        if build_dir is not None:
+            return self._get_built_scope_ini_path(build_dir)
+        else:
+            return os.path.join(
+                self._get_installed_unity_scopes_lib_dir(),
+                'clickscope', 'clickscope.ini')
+
+    def _get_built_scope_ini_path(self, build_dir):
+        # The ini and the so files need to be on the same directory.
+        # We copy them to a temp directory.
+        temp_dir_fixture = fixtures.TempDir()
+        self.useFixture(temp_dir_fixture)
+        shutil.copy(
+            os.path.join(build_dir, 'data', 'clickscope.ini'),
+            temp_dir_fixture.path)
+        shutil.copy(
+            os.path.join(build_dir, 'scope', 'click', 'libclickscope.so'),
+            temp_dir_fixture.path)
+        return os.path.join(temp_dir_fixture.path, 'clickscope.ini')
 
     def _unlock_screen(self):
         self.main_window.get_greeter().swipe()
@@ -125,18 +151,10 @@
         return scope
 
     def search(self, query):
-        # TODO move this to the unity8 main view emulator.
-        # --elopio - 2013-12-27
         search_indicator = self._proxy.select_single(
             'SearchIndicator', objectName='search')
         self.touch.tap_object(search_indicator)
-        page_header = self._proxy.select_single(
-            'PageHeader', objectName='pageHeader')
-        search_container = page_header.select_single(
-                'QQuickItem', objectName='searchContainer')
-        search_container.state.wait_for(
-            MatchesAny(Equals('narrowActive'), Equals('active')))
-        self.keyboard.type(query)
+        self.dash.enter_search_query(query)
 
     def open_app_preview(self, category, name):
         self.search(name)
@@ -182,7 +200,6 @@
 class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):
 
     def setUp(self):
-#        self.skipTest('segfaults. TODO in following branches.')
         self.add_u1_credentials()
         super(ClickScopeTestCaseWithCredentials, self).setUp()
         self.scope = self.open_scope()
@@ -191,7 +208,12 @@
     def add_u1_credentials(self):
         account_manager = credentials.AccountManager()
         account = account_manager.add_u1_credentials(
-            '[e-mail]', 'dummy')
+            '[e-mail]',
+            'name=Ubuntu+One+%40+bollo&'
+            'consumer_secret=*********&'
+            'token=**************&'
+            'consumer_key=*******&'
+            'token_secret=************')
         self.addCleanup(account_manager.delete_account, account)
 
     def test_install_with_credentials_must_start_download(self):
@@ -211,9 +233,13 @@
 
     def get_details(self):
         """Return the details of the application whose preview is open."""
-        card_header = self.select_single('CardHeader', objectName='cardHeader')
+        header_widget = self.select_single('PreviewWidget', objectName='hdr')
+        title_label = header_widget.select_single(
+            'Label', objectName='titleLabel')
+        subtitle_label = header_widget.select_single(
+            'Label', objectName='subtitleLabel')
         return dict(
-            title=card_header.title, subtitle=card_header.subtitle)
+            title=title_label.text, subtitle=subtitle_label.text)
 
     def install(self):
         parent = self.get_parent()

=== modified file 'autopilot/unityclickscope/test_fixture_setup.py'
--- autopilot/unityclickscope/test_fixture_setup.py	2014-01-28 05:21:19 +0000
+++ autopilot/unityclickscope/test_fixture_setup.py	2014-05-16 17:20:07 +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 testscenarios
 import testtools
@@ -39,14 +39,14 @@
         fake_server = self.fixture()
         self.addCleanup(self._assert_server_not_running)
         self.useFixture(fake_server)
-        self.netloc = urlparse.urlparse(fake_server.url).netloc
-        connection = httplib.HTTPConnection(self.netloc)
+        self.netloc = urllib.parse.urlparse(fake_server.url).netloc
+        connection = http.client.HTTPConnection(self.netloc)
         self.addCleanup(connection.close)
         self._do_request(connection)
         self.assertEqual(connection.getresponse().status, 200)
 
     def _assert_server_not_running(self):
-        connection = httplib.HTTPConnection(self.netloc)
+        connection = http.client.HTTPConnection(self.netloc)
         self.assertRaises(Exception, self._do_request, connection)
 
     def _do_request(self, connection):

=== modified file 'debian/control'
--- debian/control	2014-05-05 19:40:20 +0000
+++ debian/control	2014-05-16 17:20:07 +0000
@@ -39,12 +39,12 @@
 Package: unity-scope-click-autopilot
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),
-         python-autopilot,
-         python-dbus,
-         python-dbusmock,
-         python-fixtures,
-         python-testscenarios,
-         python-testtools,
+         python3-autopilot,
+         python3-dbus,
+         python3-dbusmock,
+         python3-fixtures,
+         python3-testscenarios,
+         python3-testtools,
          ubuntu-ui-toolkit-autopilot,
          unity8-autopilot,
          ${misc:Depends},