Merge lp:~thomir-deactivatedaccount/autopilot/temp-dev-fix-timezones into lp:~autopilot/autopilot/temp-dev

[Thomi Richards]

Fix DateTime issue.

Fix issue where DateTime proxy attributes show the wrong time due to the assumption that the timestamp was in UTC time.

[Christopher Lee (veebers)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-autolanding/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-autolanding/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-autolanding/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-autolanding/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-autolanding/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-autolanding/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-autolanding/25/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/441
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/441/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/58/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/446
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/446/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/99/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6624
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7504

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/100/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/introspection/types.py'
--- autopilot/introspection/types.py	2014-05-04 20:51:21 +0000
+++ autopilot/introspection/types.py	2014-05-22 06:46:15 +0000
@@ -604,7 +604,7 @@
     """
     def __init__(self, *args, **kwargs):
         super(DateTime, self).__init__(*args, **kwargs)
-        self._cached_dt = datetime.utcfromtimestamp(self[0])
+        self._cached_dt = datetime.fromtimestamp(self[0])
 
     @property
     def year(self):

=== modified file 'autopilot/tests/functional/__init__.py'
--- autopilot/tests/functional/__init__.py	2014-04-29 22:58:35 +0000
+++ autopilot/tests/functional/__init__.py	2014-05-22 06:46:15 +0000
@@ -27,9 +27,12 @@
 import logging
 from shutil import rmtree
 import subprocess
-from tempfile import mkdtemp
+from tempfile import mkdtemp, mktemp
 from testtools.content import text_content
 
+
+from autopilot import platform
+from autopilot.tests.functional.fixtures import TempDesktopFile
 from autopilot.testcase import AutopilotTestCase
 
 
@@ -181,3 +184,32 @@
         load_entry_point('autopilot==1.5.0', 'console_scripts', 'autopilot3')()
     )
 """
+
+
+class QmlScriptRunnerMixin(object):
+
+    """A Mixin class that knows how to get a proxy object for a qml script."""
+
+    def start_qml_script(self, script_contents):
+        """Launch a qml script."""
+        qml_path = mktemp(suffix='.qml')
+        open(qml_path, 'w').write(script_contents)
+        self.addCleanup(os.remove, qml_path)
+
+        extra_args = ''
+        if platform.model() != "Desktop":
+            # We need to add the desktop-file-hint
+            desktop_file = self.useFixture(
+                TempDesktopFile()
+            ).get_desktop_file_path()
+            extra_args = '--desktop_file_hint={hint_file}'.format(
+                hint_file=desktop_file
+            )
+
+        return self.launch_test_application(
+            "qmlscene",
+            "-qt=qt5",
+            qml_path,
+            extra_args,
+            app_type='qt',
+        )

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2014-04-08 00:04:17 +0000
+++ autopilot/tests/functional/test_input_stack.py	2014-05-22 06:46:15 +0000
@@ -36,6 +36,7 @@
 from autopilot.matchers import Eventually
 from autopilot.testcase import AutopilotTestCase, multiply_scenarios
 from autopilot.tests.functional.fixtures import TempDesktopFile
+from autopilot.tests.functional import QmlScriptRunnerMixin
 from autopilot.utilities import on_test_started
 
 
@@ -225,7 +226,7 @@
         return False
 
 
-class OSKBackendTests(AutopilotTestCase):
+class OSKBackendTests(AutopilotTestCase, QmlScriptRunnerMixin):
     """Testing the Onscreen Keyboard (Ubuntu Keyboard) backend specifically.
 
     There are limitations (i.e. on device only, window-mocker doesn't work on
@@ -248,24 +249,6 @@
 
         return text_area
 
-    def _start_qml_script(self, script_contents):
-        """Launch a qml script."""
-        qml_path = mktemp(suffix='.qml')
-        open(qml_path, 'w').write(script_contents)
-        self.addCleanup(os.remove, qml_path)
-
-        desktop_file = self.useFixture(
-            TempDesktopFile()
-        ).get_desktop_file_path()
-
-        return self.launch_test_application(
-            "qmlscene",
-            "-qt=qt5",
-            qml_path,
-            '--desktop_file_hint=%s' % desktop_file,
-            app_type='qt',
-        )
-
     def _launch_simple_input(self):
         simple_script = dedent("""
         import QtQuick 2.0
@@ -302,7 +285,7 @@
 
         """)
 
-        return self._start_qml_script(simple_script)
+        return self.start_qml_script(simple_script)
 
     @skipIf(platform.model() == 'Desktop', "Only suitable on a device")
     @skipIf(not osk_backend_available(), "Test requires OSK Backend installed")
@@ -416,30 +399,7 @@
             self.button_status.text, Eventually(Equals("Touch Release")))
 
 
-class TouchGesturesTests(AutopilotTestCase):
-    def _start_qml_script(self, script_contents):
-        """Launch a qml script."""
-        qml_path = mktemp(suffix='.qml')
-        open(qml_path, 'w').write(script_contents)
-        self.addCleanup(os.remove, qml_path)
-
-        extra_args = ''
-        if platform.model() != "Desktop":
-            # We need to add the desktop-file-hint
-            desktop_file = self.useFixture(
-                TempDesktopFile()
-            ).get_desktop_file_path()
-            extra_args = '--desktop_file_hint={hint_file}'.format(
-                hint_file=desktop_file
-            )
-
-        return self.launch_test_application(
-            "qmlscene",
-            "-qt=qt5",
-            qml_path,
-            extra_args,
-            app_type='qt',
-        )
+class TouchGesturesTests(AutopilotTestCase, QmlScriptRunnerMixin):
 
     def test_pinch_gesture(self):
         """Ensure that the pinch gesture pinches as expected."""
@@ -466,7 +426,7 @@
         start_green_bg = [0, 255, 0, 255]
         end_blue_bg = [0, 0, 255, 255]
 
-        app = self._start_qml_script(test_qml)
+        app = self.start_qml_script(test_qml)
         pinch_widget = app.select_single("QQuickRectangle")
         widget_bg_colour = lambda: pinch_widget.color
 

=== added file 'autopilot/tests/functional/test_types.py'
--- autopilot/tests/functional/test_types.py	1970-01-01 00:00:00 +0000
+++ autopilot/tests/functional/test_types.py	2014-05-22 06:46:15 +0000
@@ -0,0 +1,29 @@
+
+from datetime import datetime
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot.tests.functional import QmlScriptRunnerMixin
+
+from textwrap import dedent
+
+
+class TypeTests(AutopilotTestCase, QmlScriptRunnerMixin):
+
+    def test_date(self):
+        proxy = self.start_qml_script(
+            dedent(
+                """\
+                import QtQuick 2.0
+
+                Item {
+                    objectName: "TestMePlease"
+                    property date foo: "2014-01-01"
+                }
+                """
+            )
+        )
+        item = proxy.select_single('*', objectName="TestMePlease")
+        self.assertEqual(
+            item.foo,
+            datetime(2014, 1, 1, 0, 0, 0)
+        )