Merge lp:~canonical-platform-qa/autopilot/fix_vuild_for_x_incl_datetime into lp:autopilot

[Christopher Lee]

Fix build issues on Xenial. Incl. simplifying DateTime.

Fix build issues on Xenial. Incl. simplifying DateTime.

[Stuart Bishop (stub)]

Looks good to me. There is no need to use the pytz specific localize or normalize methods here.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:575
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/72/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5635
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5649
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25864

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

LGTM. I'm glad to see the sphinx fixes aren't super complicated.

review: Approve

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2015-11-18 21:36:10 +0000
+++ autopilot/application/_launcher.py	2015-12-08 04:20:49 +0000
@@ -22,6 +22,8 @@
 import fixtures
 from gi.repository import GLib
 try:
+    from gi import require_version
+    require_version('UbuntuAppLaunch', '2')
     from gi.repository import UbuntuAppLaunch
 except ImportError:
     # Note: the renamed package is not in Trusty.

=== modified file 'autopilot/introspection/types.py'
--- autopilot/introspection/types.py	2014-10-22 20:43:01 +0000
+++ autopilot/introspection/types.py	2015-12-08 04:20:49 +0000
@@ -37,8 +37,9 @@
 
 """
 
+import pytz
 from datetime import datetime, time, timedelta
-from dateutil.tz import gettz, tzutc
+from dateutil.tz import gettz
 
 import dbus
 import logging
@@ -650,39 +651,15 @@
         super(DateTime, self).__init__(*args, **kwargs)
         # Using timedelta in this manner is a workaround so that we can support
         # timestamps larger than the 32bit time_t limit on 32bit hardware.
-        # We then apply another workaround where timedelta doesn't apply
-        # daylight savings, so we need to work out the offsets for the
-        # localtime manually and apply them to give us the correct local time.
+        # We then apply the timezone information to this to get the correct
+        # datetime.
         #
         # Note. self[0] is a UTC timestamp
-        EPOCH = datetime(1970, 1, 1, tzinfo=tzutc())
+        utc = pytz.timezone('UTC')
+        EPOCH = datetime(1970, 1, 1, tzinfo=utc)
         utc_dt = EPOCH + timedelta(seconds=self[0])
 
-        local_tzinfo = gettz()
-
-        # Get the localtimes timezone offset (known as standard offset) by
-        # subtracting its dst offset (if any) from its utc offset.
-        # We apply this to the utc datetime object to get datetime object in
-        # localtime.
-        # (We will check (once we have a local datetime) if the time is in dst
-        # and make that adjustment then.)
-        utc_offset = local_tzinfo.utcoffset(utc_dt)
-        dst_offset = local_tzinfo.dst(utc_dt)
-        standard_offset = utc_offset - dst_offset
-
-        # Create a local timezone aware datetime object from the utc_dt
-        # (i.e. attaching a timezone to it) and apply the standard offset to
-        # give us the local time.
-        local_dt = utc_dt.replace(tzinfo=local_tzinfo) + standard_offset
-
-        # If the new local time is firmly in std time then the standard offset
-        # will be 0 (i.e. timedelta(0)).
-        # If the delta isn't 0 then we need to use the timezone information to
-        # apply the dst delta to the local time.
-        if standard_offset != timedelta(0):
-            local_dt = local_dt + local_tzinfo.dst(local_dt)
-
-        self._cached_dt = local_dt
+        self._cached_dt = utc_dt.astimezone(gettz())
 
     @property
     def year(self):

=== modified file 'autopilot/tests/unit/test_platform.py'
--- autopilot/tests/unit/test_platform.py	2014-07-23 03:37:24 +0000
+++ autopilot/tests/unit/test_platform.py	2015-12-08 04:20:49 +0000
@@ -39,7 +39,7 @@
     @patch('autopilot.platform._PlatformDetector')
     def test_model_creates_platform_detector(self, mock_detector):
         platform.model()
-        mock_detector.create.assert_called_once()
+        mock_detector.create.assert_called_once_with()
 
     @patch('autopilot.platform._PlatformDetector._cached_detector')
     def test_model_returns_correct_value(self, mock_detector):
@@ -49,7 +49,7 @@
     @patch('autopilot.platform._PlatformDetector')
     def test_image_codename_creates_platform_detector(self, mock_detector):
         platform.image_codename()
-        mock_detector.create.assert_called_once()
+        mock_detector.create.assert_called_once_with()
 
     @patch('autopilot.platform._PlatformDetector._cached_detector')
     def test_image_codename_returns_correct_value(self, mock_detector):

=== modified file 'debian/control'
--- debian/control	2015-07-22 23:29:11 +0000
+++ debian/control	2015-12-08 04:20:49 +0000
@@ -30,6 +30,7 @@
                python3-subunit,
                python3-testscenarios,
                python3-testtools,
+               python3-tz,
                python3-xlib (>=0.14+20091101-1ubuntu3),
                sphinx-common,
                texlive-latex-extra,

=== modified file 'docs/otto.py'
--- docs/otto.py	2013-07-25 05:47:36 +0000
+++ docs/otto.py	2015-12-08 04:20:49 +0000
@@ -56,12 +56,9 @@
                              self.content, self.lineno, self.content_offset,
                              self.block_text, self.state, self.state_machine)
         image_container = nodes.container()
-        image_container.children.append(nodes.image(uri='/images/otto-64.png'))
+        image_container.append(nodes.image(uri='/images/otto-64.png'))
         image_container['classes'] = ['otto-image-container']
         outer_container = nodes.container()
-        outer_container.children.extend(
-            [image_container]
-            + ad
-        )
+        outer_container.extend([image_container] + ad)
         outer_container['classes'] = ['otto-says-container']
         return [outer_container]