Merge lp:~veebers/autopilot/fix-datetime-tests-1324441 into lp:~autopilot/autopilot/temp-dev

[Christopher Lee]

Patch previously failing DateTime tests to use UTC TZ (due to DateTime change to using local TZ)

Recent changes to the DateTime type meant that some tests were broken as they assumed comparison to the UTC timezone (instead of the local TZ that it now is).

Fixed by patching the affected tests to use UTC timezone. (cleaner than my original fix).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/219
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6801/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8150

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Looks good to me. If I were doing it, I'd use fixtures.EnvironmentVariable instead of using our specific functionality, but as long as we continue supporting that there's no particular reason to prefer it.

review: Approve

[lp:~veebers/autopilot/fix-datetime-tests-1324441]

522. By Christopher Lee on 2014-06-08

Update use of patch_environment to use fixtures.EnvironmentVariable

[Christopher Lee (veebers)]

Ah, thank you for pointing that out. I had missed the move to fixtures.EnvironmentVariable *blush*.
I have updated to use it as you've suggested.

[lp:~veebers/autopilot/fix-datetime-tests-1324441]

523. By Christopher Lee on 2014-06-08

Merge dev-trunk w/ conflict fixes.

524. By Christopher Lee on 2014-06-08

Remove un-needed use of AutopilotTestCase

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:523
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/108/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/109/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/222
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6808/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8262

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/224
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6810/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8266

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

review: Approve (continuous-integration)

[lp:~veebers/autopilot/fix-datetime-tests-1324441]

525. By Christopher Lee on 2014-06-10

Separate out 2 unit tests. Better solution for datetime test fix.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/226
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6811/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8300

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

review: Approve (continuous-integration)

=== modified file 'autopilot/tests/unit/test_types.py'
--- autopilot/tests/unit/test_types.py	2014-05-30 09:43:51 +0000
+++ autopilot/tests/unit/test_types.py	2014-06-10 23:30:37 +0000
@@ -308,13 +308,25 @@
     def test_datetime_has_properties(self):
         dt = DateTime(1377209927)
 
-        self.assertThat(dt.timestamp, Equals(1377209927))
-        self.assertThat(dt.year, Equals(2013))
-        self.assertThat(dt.month, Equals(8))
-        self.assertThat(dt.day, Equals(22))
-        self.assertThat(dt.hour, Equals(22))
-        self.assertThat(dt.minute, Equals(18))
-        self.assertThat(dt.second, Equals(47))
+        self.assertTrue(hasattr(dt, 'timestamp'))
+        self.assertTrue(hasattr(dt, 'year'))
+        self.assertTrue(hasattr(dt, 'month'))
+        self.assertTrue(hasattr(dt, 'day'))
+        self.assertTrue(hasattr(dt, 'hour'))
+        self.assertTrue(hasattr(dt, 'minute'))
+        self.assertTrue(hasattr(dt, 'second'))
+
+    def test_datetime_properties_have_correct_values(self):
+        dt = DateTime(1377209927)
+        dt_with_tz = datetime.fromtimestamp(1377209927)
+
+        self.assertThat(dt.timestamp, Equals(dt_with_tz.timestamp()))
+        self.assertThat(dt.year, Equals(dt_with_tz.year))
+        self.assertThat(dt.month, Equals(dt_with_tz.month))
+        self.assertThat(dt.day, Equals(dt_with_tz.day))
+        self.assertThat(dt.hour, Equals(dt_with_tz.hour))
+        self.assertThat(dt.minute, Equals(dt_with_tz.minute))
+        self.assertThat(dt.second, Equals(dt_with_tz.second))
 
     def test_equality_with_datetime(self):
         dt1 = DateTime(1377209927)
@@ -329,9 +341,10 @@
         self.assertThat(dt1, Equals(dt2))
 
     def test_equality_with_datetime_timestamp(self):
+        # DateTime no longer assumes UTC and uses local TZ.
         dt1 = DateTime(1377209927)
-        dt2 = datetime.utcfromtimestamp(1377209927)
-        dt3 = datetime.utcfromtimestamp(1377209928)
+        dt2 = datetime.fromtimestamp(1377209927)
+        dt3 = datetime.fromtimestamp(1377209928)
 
         self.assertThat(dt1, Equals(dt2))
         self.assertThat(dt1, NotEquals(dt3))
@@ -342,8 +355,12 @@
         self.assertThat(dt1.datetime, IsInstance(datetime))
 
     def test_repr(self):
+        expected = repr_type(
+            u"DateTime({:%Y-%m-%d %H:%M:%S})".format(
+                datetime.fromtimestamp(1377209927)
+            )
+        )
         dt = DateTime(1377209927)
-        expected = repr_type('DateTime(2013-08-22 22:18:47)')
         observed = repr(dt)
         self.assertEqual(expected, observed)