Merge lp:~elopio/webapps-demo/fix_autopilot_tests into lp:webapps-demo

[Leo Arias]

Update the autopilot tests.

[Leo Arias (elopio)]

This is the smallest possible diff to get the tests passing. There's still some cleaning and improvements to do.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webapps-demo-ci/41/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

LGTM & works on N4

review: Approve

[Víctor R. Ruiz (vrruiz)]

Looks good to me.

review: Approve

Unmerged revisions

41. By Leo Arias on 2014-03-25

No need for tear down, autopilot kills the apps.

40. By Leo Arias on 2014-03-25

Removed unused imports.

39. By Leo Arias on 2014-03-25

Changed the name of the webview class.

38. By Leo Arias on 2014-03-25

Removed the unused code.

37. By Leo Arias on 2014-03-25

Assign the app proxy.

36. By Leo Arias on 2014-03-25

Use autopilot's launch_click_package.

35. By Leo Arias on 2014-02-26

Removed all the unused stuff.

=== removed directory 'tests/autopilot/webapps_click_packages_autopilot/emulators'
=== removed file 'tests/autopilot/webapps_click_packages_autopilot/emulators/__init__.py'
--- tests/autopilot/webapps_click_packages_autopilot/emulators/__init__.py	2013-10-10 17:47:30 +0000
+++ tests/autopilot/webapps_click_packages_autopilot/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# 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
-# by the Free Software Foundation.
-
-""" webapps-click-packages-autopilot autopilot tests and emulators - top level package."""

=== modified file 'tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py'
--- tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py	2014-01-08 15:44:03 +0000
+++ tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py	2014-03-25 02:51:31 +0000
@@ -12,13 +12,9 @@
 import subprocess
 import re
 
-from testtools.matchers import Contains, Equals, GreaterThan, NotEquals
-from autopilot.matchers import Eventually
+from testtools.matchers import NotEquals
 
 from autopilot.testcase import AutopilotTestCase
-from autopilot.introspection import get_proxy_object_for_existing_process
-
-from autopilot import platform
 
 
 def get_click_packages_list():
@@ -27,7 +23,7 @@
     if output and len(output) != 0:
         return output.split('\n')
     return []
-    
+
 def get_pid_for_appid(app_id):
     command = "ps -ef"
     output, errors = subprocess.Popen(["-c", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE, shell=True).communicate()
@@ -40,50 +36,22 @@
     return pid
 
 class WebappsClickPackagesTestCaseBase(AutopilotTestCase):
-    def launch_click_with_appid(self, app_id):
-        os.system('/sbin/initctl set-env QT_LOAD_TESTABILITY=1; start application APP_ID={0}'.format(app_id))
-        self.app_id = app_id
-        self.assertThat(lambda: get_pid_for_appid(app_id), Eventually(NotEquals("")))
-
-    def update_autopilot_proxy_for_pid(self, pid):
-        self.app_proxy = None
-        for x in range(10):
-            self.app_proxy = get_proxy_object_for_existing_process(pid=int(pid))
-            if not self.app_proxy is None:
-                break
-            sleep(1000)
-            self.assertThat(x, NotEquals(9))
-        self.assertThat(self.app_proxy, NotEquals(None))
 
     def validate_url_for_current_proxy(self):
         self.assertThat(self.app_proxy, NotEquals(None))
-        webviews = self.app_proxy.select_many('UbuntuWebView')
+        webviews = self.app_proxy.select_many('WebViewImpl')
         self.assertThat(len(webviews), NotEquals(0))
         self.assertThat(webviews[0].url, NotEquals(""))
 
-    def get_app_version(self, app_id):
-        clicks = get_click_packages_list()
-        click_infos = [package for package in clicks if package.find(app_id) != -1][0].split()
-        return click_infos[1]
-
     def validate_click_app_exists(self, package_name):
         clicks = get_click_packages_list()
         self.assertThat(len([package for package in clicks if package.find(package_name) != -1]), NotEquals(0))
 
     def validate_app_launch(self, package_name, app_name):
         self.validate_click_app_exists(package_name)
-        app_version = self.get_app_version(package_name)
-        full_app_id = "{0}_{1}_{2}".format(package_name, app_name, app_version)
-        self.launch_click_with_appid(full_app_id)
-        pid = get_pid_for_appid(package_name)
-        self.update_autopilot_proxy_for_pid(pid)
+        self.app_proxy = self.launch_click_package(package_name, app_name)
         self.validate_url_for_current_proxy()
 
     def setUp(self):
         self.app_id = None
         super(WebappsClickPackagesTestCaseBase, self).setUp()
-
-    def tearDown(self):
-        if not self.app_id is None:
-            os.system('stop application APP_ID={0}'.format(self.app_id))
-        super(WebappsClickPackagesTestCaseBase, self).tearDown()

=== modified file 'tests/autopilot/webapps_click_packages_autopilot/tests/test_click_packages.py'
--- tests/autopilot/webapps_click_packages_autopilot/tests/test_click_packages.py	2013-10-11 15:52:27 +0000
+++ tests/autopilot/webapps_click_packages_autopilot/tests/test_click_packages.py	2014-03-25 02:51:31 +0000
@@ -12,16 +12,6 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-import os
-import time
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
-from testtools import skipUnless
-
-from autopilot.matchers import Eventually
-
-from autopilot import platform
-
 from webapps_click_packages_autopilot.tests import WebappsClickPackagesTestCaseBase