From 65897d9e0f0209dcf6da538d5f6eb397d2309c23 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 21 Mar 2013 20:03:48 +0100 Subject: [PATCH] [FIX] resource: fix test: use fixed start/end hours for work periods, otherwise the test breaks randomly depending on the hour of the day bzr revid: odo@openerp.com-20130321190348-3hxugi055qa2az0c --- addons/resource/test/resource.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/resource/test/resource.yml b/addons/resource/test/resource.yml index 5b7fa108101..28604518b7b 100644 --- a/addons/resource/test/resource.yml +++ b/addons/resource/test/resource.yml @@ -40,12 +40,13 @@ I check Actual working hours on resource 'Developer' from this week - !python {model: resource.calendar}: | - from datetime import datetime, timedelta + from datetime import datetime + from dateutil.relativedelta import relativedelta now = datetime.now() - dt_from = now - timedelta(days=now.weekday()) - dt_to = dt_from+ timedelta(days=6) + dt_from = now - relativedelta(days=now.weekday(), hour=8, minute=30) + dt_to = dt_from + relativedelta(days=6, hour=17) hours = self.interval_hours_get(cr, uid, ref('timesheet_group1'), dt_from, dt_to, resource=ref('resource_developer')) - assert hours > 27 , 'Invalid Total Week working hour calculated' + assert hours > 27 , 'Invalid Total Week working hour calculated, got %r, expected > 27' % hours - Project Analysis work is of 20 hours which will start from Week start so i will calculate working schedule for resource Analyst for the same. -