[robotframework] push by janne.piironen@gmail.com - DateTime: Fixed tests breaking on timezone changes on 2014-05-30 13:23 GMT

Fri, 30 May 2014 06:24:14 -0700 

Revision: ce280b07e427
Branch:   default
Author:   Janne Piironen <janne.piiro...@gmail.com>
Date:     Fri May 30 13:23:14 2014 UTC
Log:      DateTime: Fixed tests breaking on timezone changes
http://code.google.com/p/robotframework/source/detail?r=ce280b07e427

Modified:
 /atest/robot/standard_libraries/datetime/convert_date_result_format.txt
 /atest/testdata/standard_libraries/datetime/convert_date_input_format.txt
 /atest/testdata/standard_libraries/datetime/convert_date_result_format.txt
 /atest/testdata/standard_libraries/datetime/datesandtimes.py

=======================================
--- /atest/robot/standard_libraries/datetime/convert_date_result_format.txt Tue Apr 29 18:01:18 2014 UTC +++ /atest/robot/standard_libraries/datetime/convert_date_result_format.txt Fri May 30 13:23:14 2014 UTC 
@@ -6,9 +6,15 @@
 *** Test Cases ***
 Should convert to timestamp
     Check Test Case    ${TESTNAME}
+
+Should convert to timestamp with format
+    Check Test Case    ${TESTNAME}

 Should convert to epoch
     Check Test Case    ${TESTNAME}

 Should convert to datetime
     Check Test Case    ${TESTNAME}
+
+Should exclude milliseconds
+    Check Test Case    ${TESTNAME}
=======================================
--- /atest/testdata/standard_libraries/datetime/convert_date_input_format.txt Mon May 26 12:20:29 2014 UTC +++ /atest/testdata/standard_libraries/datetime/convert_date_input_format.txt Fri May 30 13:23:14 2014 UTC 
@@ -16,8 +16,8 @@
24.04.2014 2014-04-24 00:00:00.000 %d.%m.%Y 24-04.2014@21 2014-04-24 21:00:00.000 %d-%m.%Y@%H
-Epoch ${1398365112.0} 2014-04-24 21:45:12.000 - ${1398365112.123} 2014-04-24 21:45:12.123 +Epoch ${EPOCH} 2014-04-24 21:45:12.000 + ${EPOCH + 0.123} 2014-04-24 21:45:12.123
Datetime object ${datetime(2014, 4, 24, 21, 45, 12, 123000)} 2014-04-24 21:45:12.123 ${datetime(2014, 4, 24, 21)} 2014-04-24 21:00:00.000 
@@ -33,9 +33,9 @@
2014-04-24T21:45:12.123456 2014-04-24 21:45:12.123 %Y-%m-%dT%H:%M:%S.%f 2014-04-24T21:45:12.1234 2014-04-24 21:45:12.123 %Y-%m-%dT%H:%M:%S.%f 2014-04-24T21:45:12.1235 2014-04-24 21:45:12.124 %Y-%m-%dT%H:%M:%S.%f - ${1398365112.123456} 2014-04-24 21:45:12.123 - ${1398365112.1234} 2014-04-24 21:45:12.123 - ${1398365112.1235} 2014-04-24 21:45:12.124 + ${EPOCH + 0.123456} 2014-04-24 21:45:12.123 + ${EPOCH + 0.1234} 2014-04-24 21:45:12.123 + ${EPOCH + 0.1235} 2014-04-24 21:45:12.124 ${datetime(2014, 4, 24, 21, 45, 12, 123456)} 2014-04-24 21:45:12.123 ${datetime(2014, 4, 24, 21, 45, 12, 123400)} 2014-04-24 21:45:12.123 ${datetime(2014, 4, 24, 21, 45, 12, 123500)} 2014-04-24 21:45:12.124 
=======================================
--- /atest/testdata/standard_libraries/datetime/convert_date_result_format.txt Mon May 26 12:20:29 2014 UTC +++ /atest/testdata/standard_libraries/datetime/convert_date_result_format.txt Fri May 30 13:23:14 2014 UTC 
@@ -6,28 +6,28 @@
 *** Variables ***
 ${DATE}           ${datetime(2014, 4, 24, 21, 45, 12, 123000)}
-*** Test Cases *** INPUT FORMAT OUTPUT INPUT FORMAT +*** Test Cases *** INPUT FORMAT OUTPUT INPUT FORMAT 
 Should convert to timestamp
2014-04-24 21:45:12.123 timeSTAMP 2014-04-24 21:45:12.123 - 2014-04-24 21:45:12.123 tImestamp 2014-04-24 21:45:12.123 %Y-%m-%d %H:%M:%S.%f - ${1398365112.0} TIMEstamp 2014-04-24 21:45:12.000 + 2014-04-24 21:45:12.123 tImestamp 2014-04-24 21:45:12.123 %Y-%m-%d %H:%M:%S.%f + ${EPOCH} TIMEstamp 2014-04-24 21:45:12.000 ${DATE} TimeStamp 2014-04-24 21:45:12.123 

 Should convert to timestamp with format
2014-04-24 21:45:12.123 TimeStamp:%H:%M:%S %Y-%m-%d 21:45:12 2014-04-24 2014-04-24 21:45:12.123 TimeStamp:%H:%M:%S.%f %Y-%m-%d 21:45:12.123000 2014-04-24 - 2014/04/24 21:45:12.123 timestamp:%H:%M %Y-%m-%d 21:45 2014-04-24 %Y/%m/%d %H:%M:%S.%f + 2014/04/24 21:45:12.123 timestamp:%H:%M %Y-%m-%d 21:45 2014-04-24 %Y/%m/%d %H:%M:%S.%f 

 Should convert to epoch
- 2014-04-24 21:45:12.123 epoch ${1398365112.123} - 2014-04-24 21:45:12.123 epoch ${1398365112.123} %Y-%m-%d %H:%M:%S.%f - ${1398365112.0} epoch ${1398365112.0} - ${DATE} epoch ${1398365112.123} + 2014-04-24 21:45:12.123 epoch ${EPOCH + 0.123} + 2014-04-24 21:45:12.123 epoch ${EPOCH + 0.123} %Y-%m-%d %H:%M:%S.%f + ${EPOCH} epoch ${EPOCH} + ${DATE} epoch ${EPOCH + 0.123} 

 Should convert to datetime
2014-04-24 21:45:12.123 datetime ${DATE} - 2014-04-24 21:45:12.123 datetime ${DATE} %Y-%m-%d %H:%M:%S.%f - ${1398365112.123} dateTiMe ${DATE} + 2014-04-24 21:45:12.123 datetime ${DATE} %Y-%m-%d %H:%M:%S.%f + ${EPOCH + 0.123} dateTiMe ${DATE} ${DATE} datetimE ${DATE} 

 Should exclude milliseconds
@@ -35,7 +35,7 @@
2014-04-24 21:45:12.123 timestamp 2014-04-24 21:45:12 2014-04-24 21:45:12.999 timestamp 2014-04-24 21:45:13 ${DATE} timestamp 2014-04-24 21:45:12 - ${1398365112.123} datetime ${datetime(2014, 4, 24, 21, 45, 12)} + ${EPOCH + 0.123} datetime ${datetime(2014, 4, 24, 21, 45, 12)} 

 *** Keywords ***
 Date Conversion Should Succeed
=======================================
--- /atest/testdata/standard_libraries/datetime/datesandtimes.py Tue Apr 29 18:01:18 2014 UTC +++ /atest/testdata/standard_libraries/datetime/datesandtimes.py Fri May 30 13:23:14 2014 UTC 
@@ -1,2 +1,4 @@
 from datetime import timedelta, datetime
+import time
+EPOCH = 1398375912.0 + (time.altzone if time.localtime().tm_isdst else time.timezone) 

--
--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group. 
To unsubscribe from this group and stop receiving emails from it, send an email 
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to