Merge lp:~elopio/webapps-demo/autopilot-tests-fixes into lp:webapps-demo

[Leo Arias]

Fixes to webapps-core AP.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)

[lp:~elopio/webapps-demo/autopilot-tests-fixes]

40. By Leo Arias on 2014-02-21

Added setup tools to the build deps.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/19/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

40. By Leo Arias on 2014-02-21

Added setup tools to the build deps.

39. By Leo Arias on 2014-02-21

Merged with trunk.

38. By Alexandre Abreu on 2013-12-03

update to use click autopilot caps

37. By Alexandre Abreu on 2013-12-03

update to use click autopilot caps

36. By Alexandre Abreu on 2013-11-28

Fixes

35. By David Barth on 2013-11-28

rename to webapps-core and adjust AP test suite

34. By David Barth on 2013-11-27

merging in the autopilot test suite

33. By David Barth on 2013-11-26

specify architecture explicitely: all, and bump version numbers

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-27 13:51:02 +0000
+++ debian/changelog	2014-02-21 19:03:33 +0000
@@ -1,3 +1,9 @@
+webapps-core (0.20) trusty; urgency=low
+
+  * Rename package to webapps-core
+
+ -- David Barth <[e-mail]>  Thu, 28 Nov 2013 15:58:42 +0100
+
 webapps-demo (0.19) saucy; urgency=low
 
   * Get rid of the main package; icons and desktop files are no longer packaged
 
=== modified file 'debian/control'
--- debian/control	2014-01-08 15:44:03 +0000
+++ debian/control	2014-02-21 19:03:33 +0000
@@ -1,10 +1,11 @@
-Source: webapps-demo
+Source: webapps-core
 Section: web
 Priority: extra
-Maintainer: Ubuntu Developers <[e-mail]>
+Maintainer: Webapps Team <[e-mail]>
 XSBC-Original-Maintainer: Ricardo Mendoza <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
-               click
+               click,
+               python-setuptools,
 Standards-Version: 3.9.3
 Vcs-Bzr: lp:webapps-demo
 
@@ -38,4 +39,3 @@
  of popuplar web services on Ubuntu.
  This package contains click packages that will are pre-installed
  in the base image.
-
 
=== removed file 'debian/postinst'
--- debian/postinst	2013-09-09 17:48:39 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Setting up click packages"
-
-click_db=/usr/share/click/preinstalled
-tmpdir=/tmp/webapps-demo
-
-mkdir -p -m 755 "$click_db"
-chown clickpkg:clickpkg "$click_db"
-
-for package in $(ls "$tmpdir")
-do
-    echo "Setting up $package"
-    # WARNING: install for user phablet, as --all-users doesn't install
-    #          the aa-exec frontend to enable the containment of webapps
-    click install --force-missing-framework --root="$click_db" \
-        --user=phablet \
-        "$tmpdir/$package"
-done
 
=== modified file 'debian/rules'
--- debian/rules	2013-09-09 17:48:39 +0000
+++ debian/rules	2014-02-21 19:03:33 +0000
@@ -1,44 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-include /usr/share/dpkg/default.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 %:
-	dh $@ 
-
-build_click = make -f debian/rules click APP=$(1) 
-
-click:
-	mkdir -p build
-	cd build; click build ../$(APP)
-
-override_dh_auto_conf:
-	rm -rf build
-	mkdir -p build
-
-override_dh_auto_build:
-	$(call build_click,webapp-twitter)
-	$(call build_click,webapp-ebay)
-	$(call build_click,webapp-amazon)
-	$(call build_click,webapp-facebook)
-	$(call build_click,webapp-ubuntuone)
-	$(call build_click,webapp-gmail)
-
-override_dh_clean:
-	rm -rf build
-	dh_clean
+	dh $@ --with python2
+
+override_dh_install:
+	# install autopilot tests
+	cd tests/autopilot; \
+	set -ex; for python in $(shell pyversions -r); do \
+		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done; \
+	cd $(CURDIR)
+	dh_install -X'*.pyc' --fail-missing
 
=== added file 'debian/webapps-core-click-autopilot.install'
--- debian/webapps-core-click-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/webapps-core-click-autopilot.install	2014-02-21 19:03:33 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*
 
=== removed file 'debian/webapps-demo-click.install'
--- debian/webapps-demo-click.install	2013-09-09 17:48:39 +0000
+++ debian/webapps-demo-click.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-build/* /tmp/webapps-demo/
 
=== modified file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	2013-10-10 17:47:30 +0000
+++ tests/autopilot/setup.py	2014-02-21 19:03:33 +0000
@@ -14,7 +14,7 @@
    name='webapps-click-packages-autopilot',
    version='0.1',
    description='Webapps click packages autopilot tests.',
-   url='https://launchpad.net/webapps-demo',
+   url='https://launchpad.net/webapps-core',
    license='GPLv3',
    packages=find_packages(),
 )
 
=== 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-02-21 19:03:33 +0000
@@ -11,6 +11,7 @@
 import os.path
 import subprocess
 import re
+import time
 
 from testtools.matchers import Contains, Equals, GreaterThan, NotEquals
 from autopilot.matchers import Eventually
@@ -28,6 +29,7 @@
         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()
@@ -39,22 +41,8 @@
             pid = pids[0].split()[1]
     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')
@@ -70,13 +58,13 @@
         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):
+    def validate_app_launch(self, package_name, app_name, app_hint=None):
+        if not app_hint:
+            app_hint = app_name.strip('webapp-')
         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):
@@ -85,5 +73,5 @@
 
     def tearDown(self):
         if not self.app_id is None:
-            os.system('stop application APP_ID={0}'.format(self.app_id))
+            os.system('upstart-app-stop {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-02-21 19:03:33 +0000
@@ -27,7 +27,7 @@
 
 class DefaultInstallWebappsClickPackagesTestCaseBase(WebappsClickPackagesTestCaseBase):
     def setUp(self):
-        super(WebappsClickPackagesTestCaseBase, self).setUp()
+        super(DefaultInstallWebappsClickPackagesTestCaseBase, self).setUp()
 
     def test_facebook(self):
         package_name = 'com.ubuntu.developer.webapps.webapp-facebook'
@@ -57,6 +57,6 @@
     def test_ubuntuone(self):
         package_name = 'com.ubuntu.developer.webapps.webapp-ubuntuone'
         app_name = 'webapp-ubuntuone'
-        self.validate_app_launch(package_name, app_name)
+        self.validate_app_launch(package_name, app_name, 'one.ubuntu')
 
 
 
=== modified file 'webapp-amazon/manifest.json'
--- webapp-amazon/manifest.json	2013-09-24 19:10:36 +0000
+++ webapp-amazon/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "Amazon (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-amazon": {
             "apparmor": "webapp-amazon.json",
@@ -10,6 +11,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-amazon",
     "title": "webapp-amazon",
-    "version": "1.0.6"
+    "version": "1.0.7"
 }
 
 
=== modified file 'webapp-ebay/manifest.json'
--- webapp-ebay/manifest.json	2013-10-16 16:36:55 +0000
+++ webapp-ebay/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "eBay (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-ebay": {
             "apparmor": "webapp-ebay.json",
@@ -10,6 +11,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-ebay",
     "title": "webapp-ebay",
-    "version": "1.0.8"
+    "version": "1.0.9"
 }
 
 
=== modified file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json	2013-10-01 15:10:40 +0000
+++ webapp-facebook/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "Facebook (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-facebook": {
             "apparmor": "webapp-facebook.json",
@@ -10,6 +11,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-facebook",
     "title": "webapp-facebook",
-    "version": "1.0.5"
+    "version": "1.0.6"
 }
 
 
=== modified file 'webapp-gmail/manifest.json'
--- webapp-gmail/manifest.json	2013-10-18 19:05:50 +0000
+++ webapp-gmail/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "Gmail (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-gmail": {
             "apparmor": "webapp-gmail.json",
 
=== modified file 'webapp-twitter/manifest.json'
--- webapp-twitter/manifest.json	2013-10-15 17:17:21 +0000
+++ webapp-twitter/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "Twitter (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-twitter": {
             "apparmor": "webapp-twitter.json",
@@ -10,6 +11,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-twitter",
     "title": "webapp-twitter",
-    "version": "1.0.5"
+    "version": "1.0.6"
 }
 
 
=== modified file 'webapp-ubuntuone/manifest.json'
--- webapp-ubuntuone/manifest.json	2013-09-26 16:17:53 +0000
+++ webapp-ubuntuone/manifest.json	2014-02-21 19:03:33 +0000
@@ -1,6 +1,7 @@
 {
     "description": "Ubuntu One (webapp version)",
     "framework": "ubuntu-sdk-13.10",
+    "architecture": "all",
     "hooks": {
         "webapp-ubuntuone": {
             "apparmor": "webapp-ubuntuone.json",
@@ -10,6 +11,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-ubuntuone",
     "title": "webapp-ubuntuone",
-    "version": "1.0.4"
+    "version": "1.0.5"
 }