Skip to content

erp5
erp5
Commit cec1536a authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Fix test to take into account timezone (see r17867 - r17870). 

Apply Jerome's patch for converting to UTC.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17873 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d5b607fa
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 41 deletions
product/ERP5/Tool/DomainTool.py
View file @ cec1536a
......@@ -115,7 +115,7 @@ class DomainTool(BaseTool):
if value is not None:
# Handle Mysql datetime correctly
if isinstance(value, DateTime):
value = value.ISO()
value = value.toZone('UTC').ISO()
format_dict['value'] = value
# Generate expression
expression += "OR (%(base_name)s = '%(value)s') " \
......
product/ERP5/Tool/SimulationTool.py
View file @ cec1536a
......@@ -955,7 +955,7 @@ class SimulationTool(BaseTool):
if len(date_value_list) > 0:
date = min(date_value_list)
if isinstance(date, DateTime):
date = date.ISO()
date = date.toZone('UTC').ISO()
# build a query for date to take range into account
date_query_kw = {"inventory.date" : date,
"operator" : column_value_dict.get('date', {}).get('operator', []),
......
product/ERP5/tests/testAlarm.py
View file @ cec1536a
......@@ -57,6 +57,8 @@ class TestAlarm(ERP5TypeTestCase):
sales_order_id = '1'
quantity = 10
base_price = 0.7832
# year/month/day hour:minute:second
date_format = '%i/%i/%i %i:%i:%d UTC'
def getTitle(self):
return "Alarm"
......@@ -152,7 +154,7 @@ class TestAlarm(ERP5TypeTestCase):
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
alarm = self.newAlarm()
now = DateTime()
now = DateTime().toZone('UTC')
hour_to_remove = now.hour() % 3
now = addToDate(now,hour=-hour_to_remove)
date = addToDate(now,day=2)
......@@ -179,12 +181,12 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Test Some Hours'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,15,00,00))
now = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,15,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,21,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,7,06,00,00))
right_fourth_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,7,10,00,00))
right_first_date = DateTime(self.date_format % (2006,10,6,15,00,00))
now = DateTime(self.date_format % (2006,10,6,15,00,00))
right_second_date = DateTime(self.date_format % (2006,10,6,21,00,00))
right_third_date = DateTime(self.date_format % (2006,10,7,06,00,00))
right_fourth_date = DateTime(self.date_format % (2006,10,7,10,00,00))
alarm = self.newAlarm()
hour_list = (6,10,15,21)
alarm.setPeriodicityStartDate(now)
......@@ -205,11 +207,11 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Every Day Once'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
now = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,10,00,00))
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,10,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,7,10,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,8,10,00,00))
now = DateTime(self.date_format % (2006,10,6,10,00,00))
right_first_date = DateTime(self.date_format % (2006,10,6,10,00,00))
right_second_date = DateTime(self.date_format % (2006,10,7,10,00,00))
right_third_date = DateTime(self.date_format % (2006,10,8,10,00,00))
alarm = self.newAlarm()
alarm.setPeriodicityStartDate(now)
alarm.setPeriodicityDayFrequency(1)
......@@ -229,11 +231,11 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Every 3 Days Some Hours'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,14,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,15,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,6,17,00,00))
right_fourth_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,9,14,00,00))
right_first_date = DateTime(self.date_format % (2006,10,6,14,00,00))
right_second_date = DateTime(self.date_format % (2006,10,6,15,00,00))
right_third_date = DateTime(self.date_format % (2006,10,6,17,00,00))
right_fourth_date = DateTime(self.date_format % (2006,10,9,14,00,00))
alarm = self.newAlarm()
alarm.setPeriodicityStartDate(right_first_date)
alarm.setPeriodicityDayFrequency(3)
......@@ -255,11 +257,11 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Some Week Days Some Hours'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,9,27,6,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,9,29,15,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,2,6,00,00))
right_fourth_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,2,15,00,00))
right_first_date = DateTime(self.date_format % (2006,9,27,6,00,00))
right_second_date = DateTime(self.date_format % (2006,9,29,15,00,00))
right_third_date = DateTime(self.date_format % (2006,10,2,6,00,00))
right_fourth_date = DateTime(self.date_format % (2006,10,2,15,00,00))
alarm = self.newAlarm()
get_transaction().commit()
self.tic()
......@@ -293,11 +295,11 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Some Month Days Some Hours'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,01,12,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,01,14,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,15,12,00,00))
right_fourth_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,15,14,00,00))
right_first_date = DateTime(self.date_format % (2006,10,01,12,00,00))
right_second_date = DateTime(self.date_format % (2006,10,01,14,00,00))
right_third_date = DateTime(self.date_format % (2006,10,15,12,00,00))
right_fourth_date = DateTime(self.date_format % (2006,10,15,14,00,00))
alarm = self.newAlarm()
alarm.setPeriodicityStartDate(right_first_date)
alarm.setPeriodicityMonthDayList((1,15))
......@@ -313,10 +315,10 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Once Every 2 Month'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,01,6,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,12,01,6,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2007,2,01,6,00,00))
right_first_date = DateTime(self.date_format % (2006,10,01,6,00,00))
right_second_date = DateTime(self.date_format % (2006,12,01,6,00,00))
right_third_date = DateTime(self.date_format % (2007,2,01,6,00,00))
alarm = self.newAlarm()
alarm.setPeriodicityStartDate(right_first_date)
alarm.setPeriodicityMonthDayList((1,))
......@@ -332,11 +334,11 @@ class TestAlarm(ERP5TypeTestCase):
message = 'Every Day Once Week 41 And 43'
ZopeTestCase._print('\n%s ' % message)
LOG('Testing... ',0,message)
# year/month/day hour:minute:second
right_first_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,1,6,00,00))
right_second_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,9,6,00,00))
right_third_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,10,6,00,00))
right_fourth_date = DateTime('%i/%i/%i %i:%i:%d' % (2006,10,11,6,00,00))
right_first_date = DateTime(self.date_format % (2006,10,1,6,00,00))
right_second_date = DateTime(self.date_format % (2006,10,9,6,00,00))
right_third_date = DateTime(self.date_format % (2006,10,10,6,00,00))
right_fourth_date = DateTime(self.date_format % (2006,10,11,6,00,00))
alarm = self.newAlarm()
alarm.setPeriodicityStartDate(right_first_date)
alarm.setPeriodicityHourList((6,))
......
product/ERP5/tests/testInventoryAPI.py
View file @ cec1536a
......@@ -715,9 +715,9 @@ class TestInventoryList(InventoryAPITestCase):
def test_GroupByDate(self):
# group by date currently only groups by *exact* date
getInventoryList = self.getSimulationTool().getInventoryList
self._makeMovement(quantity=1, start_date=DateTime(2000, 1, 1))
self._makeMovement(quantity=1, start_date=DateTime(2000, 1, 1))
self._makeMovement(quantity=1, start_date=DateTime(2001, 1, 1))
self._makeMovement(quantity=1, start_date=DateTime('2000/1/1 12:00 UTC'))
self._makeMovement(quantity=1, start_date=DateTime('2000/1/1 12:00 UTC'))
self._makeMovement(quantity=1, start_date=DateTime('2001/1/1 12:00 UTC'))
inventory_list = getInventoryList(node_uid=self.node.getUid(),
group_by_date=1)
self.assertEquals(2, len(inventory_list))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7