Merge lp:~ahayzen/ubuntu-weather-app/fix-control-depends-01 into lp:ubuntu-weather-app

[Andrew Hayzen]

* Fixes for missing packages in debian/control

* Fixes for missing packages in debian/control

On a blank install in Wily I had to manually install these packages to get the weather-app to run.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:196
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/84/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/350/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/84/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I'm not sure why this is failing--but it looks good to me.

Could you also fix app/components/NoAPIKeyErrorStateComponent.qml to use Ubuntu.Components 1.3. Not sure how that got set to 1.5... Seems silly to make an MP just for that.

review: Needs Information

[Andrew Hayzen (ahayzen)]

The first failure is due to the location allow/deny appearing, the same as clock. The other two appear to be due to not enough locations in the list, I assume because it has no current location or it wasn't added correctly.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/150/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/429/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/150/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:198
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/151/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/430/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/151/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:199
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/152/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/431/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/152/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:200
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/153/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/432/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/153/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:201
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/154/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/433/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/154/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:202
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/155/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/434/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/155/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:202
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/156/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/435/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/156/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/weather-app-autolanding/412/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1565/console

review: Needs Fixing (continuous-integration)

Unmerged revisions

202. By Andrew Hayzen on 2016-01-20

* Extra debugging

201. By Andrew Hayzen on 2016-01-20

* Add GeolocationPermissionRequest helper

200. By Andrew Hayzen on 2016-01-20

* Split stop and start commands

199. By Andrew Hayzen on 2016-01-20

* Run location service in background

198. By Andrew Hayzen on 2016-01-20

* Add fixture to fix location issues
* Update copyright years

197. By Andrew Hayzen on 2016-01-20

* Fix for incorrect Ubuntu.Components version

196. By Andrew Hayzen on 2016-01-12

Fixes for missing packages in debian/control

=== modified file 'app/components/NoAPIKeyErrorStateComponent.qml'
--- app/components/NoAPIKeyErrorStateComponent.qml	2015-11-12 01:45:36 +0000
+++ app/components/NoAPIKeyErrorStateComponent.qml	2016-01-20 16:35:28 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015, 2016 Canonical Ltd
  *
  * This file is part of Ubuntu Weather App
  *
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.5
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-17 02:29:07 +0000
+++ debian/changelog	2016-01-20 16:35:28 +0000
@@ -2,6 +2,7 @@
 
   [ Andrew Hayzen ]
   * Release 3.1 and bump version to 3.2
+  * Fixes for missing packages in debian/control
 
   [ Girish Rawat ]
   * Added new READMEs

=== modified file 'debian/control'
--- debian/control	2015-02-09 16:36:43 +0000
+++ debian/control	2016-01-20 16:35:28 +0000
@@ -22,6 +22,8 @@
 Depends: qmlscene,
          qtdeclarative5-localstorage-plugin,
          qml-module-qt-labs-settings,
+         qtdeclarative5-qtlocation-plugin,
+         qtdeclarative5-qtpositioning-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          suru-icon-theme | ubuntu-mobile-icons,

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-11-03 00:38:48 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2016-01-20 16:35:28 +0000
@@ -98,6 +98,16 @@
 
             self.pointing_device.drag(start_x, start_y,
                                       start_x, stop_y, rate=2)
+
+            # If the GeoLocation dialog appears select allow
+            try:
+                location = self.main_view.wait_select_single(
+                    GeolocationPermissionRequest)
+                location.click_allow_button()
+                location.wait_until_destroyed()
+            except dbus.StateNotFoundError as e:
+                logger.error("Could not allow location (%s)" % e)
+
             self.isReady.wait_for(True)
         except dbus.StateNotFoundError:
             logger.error('BottomEdge element not found.')
@@ -179,6 +189,22 @@
                                   objectName="windForecast").value
 
 
+class GeolocationPermissionRequest(UbuntuUIToolkitCustomProxyObjectBase):
+    @click_object
+    def click_allow_button(self):
+        return self.get_allow_button()
+
+    @click_object
+    def click_deny_button(self):
+        return self.get_deny_button()
+
+    def get_allow_button(self):
+        return self.select_single("Button", objectName="allow")
+
+    def get_deny_button(self):
+        return self.select_single("Button", objectName="deny")
+
+
 class HomePage(PageWithBottomEdge):
     """Autopilot helper for HomePage."""
     def __init__(self, *args, **kwargs):

=== added file 'tests/autopilot/ubuntu_weather_app/fixture_setup.py'
--- tests/autopilot/ubuntu_weather_app/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/fixture_setup.py	2016-01-20 16:35:28 +0000
@@ -0,0 +1,52 @@
+# Copyright (C) 2014, 2016 Canonical Ltd
+#
+# This file is part of Ubuntu Weather App
+#
+# Ubuntu Clock App 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.
+#
+# Ubuntu Clock App 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/>.
+
+"""Clock app autopilot fixtures."""
+
+import fixtures
+import logging
+import subprocess
+
+
+class LocationServiceTestEnvironment(fixtures.Fixture):
+
+    def setUp(self):
+        super(LocationServiceTestEnvironment, self).setUp()
+        self._set_location_service_testing(True)
+        self.addCleanup(self._set_location_service_testing, False)
+
+    def _set_location_service_testing(self, test_mode):
+        test = 'true' if test_mode else 'false'
+        logger = logging.getLogger(__name__)
+
+        try:
+            subprocess.check_call(
+                "sudo service ubuntu-location-service stop",
+                shell=True)
+        except subprocess.CalledProcessError as e:
+                logger.error('Unable to stop location service (%s).' % e)
+
+        try:
+            subprocess.check_call(
+                "sudo /usr/bin/ubuntu-location-serviced"
+                " --bus system --provider dummy::Provider"
+                " --dummy::Provider::ReferenceLocationLat=51.50853"
+                " --dummy::Provider::ReferenceLocationLon=-0.12574 & disown",
+                shell=True)
+        except subprocess.CalledProcessError as e:
+            logger.error('Unable to start location service in testing mode '
+                         'tests may fail as a result. (%s)' % e)
+

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2015-08-18 23:48:51 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2016-01-20 16:35:28 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014, 2015 Canonical Ltd
+# Copyright (C) 2013, 2014, 2015, 2016 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
@@ -24,7 +24,7 @@
 import logging
 
 import fixtures
-from ubuntu_weather_app import UbuntuWeatherApp
+from ubuntu_weather_app import fixture_setup, UbuntuWeatherApp
 import ubuntu_weather_app
 
 from autopilot import logging as autopilot_logging
@@ -65,6 +65,9 @@
 
     def setUp(self):
         super(BaseTestCaseWithPatchedHome, self).setUp()
+
+        self.useFixture(fixture_setup.LocationServiceTestEnvironment())
+
         self.launcher, self.test_type = self.get_launcher_method_and_type()
         self.home_dir = self._patch_home()