[Erp5-report] r24312 - /erp5/trunk/products/ERP5/tests/testOrderBuilder.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Oct 24 09:45:08 2008
New Revision: 24312

URL: http://svn.erp5.org?rev=24312&view=rev
Log:
use DateTime(str(DateTime().earliestTime() + gap)) instead of
(DateTime().earliestTime() + gap).earliestTime(), since
DateTime().__add__() returns a different tz offset if daylight saving
changes.

For example (timezone is Europe/Paris):

>>> DateTime().earliestTime()
DateTime('2008/10/24')
>>> DateTime().earliestTime()._tz
'GMT+2'
>>> (DateTime().earliestTime()+10)
DateTime('2008/11/03')
>>> (DateTime().earliestTime()+10)._tz
'GMT+2'
>>> DateTime(str((DateTime().earliestTime()+10)))
DateTime('2008/11/03')
>>> DateTime(str((DateTime().earliestTime()+10)))._tz
'GMT+1'

Modified:
    erp5/trunk/products/ERP5/tests/testOrderBuilder.py

Modified: erp5/trunk/products/ERP5/tests/testOrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrderBuilder.py?rev=24312&r1=24311&r2=24312&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrderBuilder.py (original)
+++ erp5/trunk/products/ERP5/tests/testOrderBuilder.py Fri Oct 24 09:45:08 2008
@@ -30,6 +30,7 @@
 import unittest
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from DateTime import DateTime
 from zLOG import LOG
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.CMFCore.utils import getToolByName
@@ -390,11 +391,11 @@
     if not run: return
 
     self.wanted_quantity = 1.0
-    self.wanted_start_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
-
-    self.wanted_stop_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
+    self.wanted_start_date = DateTime(
+      str(self.datetime.earliestTime() \
+          + self.order_builder_hardcoded_time_diff))
+
+    self.wanted_stop_date = self.wanted_start_date
 
     sequence_list = SequenceList()
     sequence_list.addSequenceString(self.common_sequence_string)
@@ -424,11 +425,11 @@
                       '
 
     self.wanted_quantity = 1.0
-    self.wanted_start_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
-
-    self.wanted_stop_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
+    self.wanted_start_date = DateTime(
+      str(self.datetime.earliestTime() + \
+          self.order_builder_hardcoded_time_diff))
+
+    self.wanted_stop_date = self.wanted_start_date
 
     self.decrease_quantity_matrix = {
       'size/Man' : 1.0,
@@ -450,12 +451,14 @@
     self.max_delay = 14.0
 
     self.wanted_quantity = 1.0
-    self.wanted_start_date = self.datetime.earliestTime() \
-      - self.max_delay \
-      + self.order_builder_hardcoded_time_diff
-
-    self.wanted_stop_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
+    self.wanted_start_date = DateTime(
+      str(self.datetime.earliestTime() \
+          - self.max_delay \
+          + self.order_builder_hardcoded_time_diff))
+
+    self.wanted_stop_date = DateTime(
+      str(self.datetime.earliestTime() \
+          + self.order_builder_hardcoded_time_diff))
 
     sequence_list = SequenceList()
     sequence_list.addSequenceString(self.common_sequence_string)
@@ -468,11 +471,11 @@
     if not run: return
 
     self.wanted_quantity = 1.0
-    self.wanted_start_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
-
-    self.wanted_stop_date = self.datetime.earliestTime() \
-      + self.order_builder_hardcoded_time_diff
+    self.wanted_start_date = DateTime(
+      str(self.datetime.earliestTime() \
+          + self.order_builder_hardcoded_time_diff))
+
+    self.wanted_stop_date = self.wanted_start_date
 
     sequence_list = SequenceList()
     sequence_list.addSequenceString(self.common_sequence_string)