Merge lp:~tjoneslo/akiban-server/fix-test-bug-1012317 into lp:~akiban-technologies/akiban-server/trunk

Proposed by Thomas Jones-Low
Status: Merged
Approved by: Nathan Williams
Approved revision: 2603
Merged at revision: 2603
Proposed branch: lp:~tjoneslo/akiban-server/fix-test-bug-1012317
Merge into: lp:~akiban-technologies/akiban-server/trunk
Diff against target: 12 lines (+2/-1)
1 file modified
src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug1012317.yaml (+2/-1)
To merge this branch: bzr merge lp:~tjoneslo/akiban-server/fix-test-bug-1012317
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Review via email: mp+155276@code.launchpad.net

Description of the change

Fix the test for bug 1012317 which is having problems in the FTS due to time zone issues. This will break again in November (with the DST change).

To post a comment you must log in.
Revision history for this message
Nathan Williams (nwilliams) wrote :

Delightful.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug1012317.yaml'
2--- src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug1012317.yaml 2013-03-06 15:23:38 +0000
3+++ src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug1012317.yaml 2013-03-25 16:36:26 +0000
4@@ -3,5 +3,6 @@
5 #
6 ---
7 - Statement: select from_unixtime(1362530682), from_unixtime(1362530682) - 0, from_unixtime(1362530682) - 86400;
8-- output: [['2013-03-06 00:44:42.0', 2.0130306004442E13, 2.0130305918042E13]]
9+- output: !select-engine { it: [['2013-03-06 00:44:42.0', 2.0130306004442E13, 2.0130305918042E13]],
10+ sys-aksql: [['2013-03-05 19:44:42.0', 2.0130305194442E13, 2.0130305108042E13]] }
11 ...
12\ No newline at end of file

Subscribers

People subscribed via source and target branches