From b1b7b6b30ab96871a99df897c6be849d26228a8f Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 8 Feb 2013 14:04:15 +0100 Subject: [PATCH 1/3] [FIX] Use UTC time in tests manual action bzr revid: jco@openerp.com-20130208130415-wfblltllvajz8q5s --- .../tests/test_account_followup.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py index 14f458de98d..f60f4d5a98c 100644 --- a/addons/account_followup/tests/test_account_followup.py +++ b/addons/account_followup/tests/test_account_followup.py @@ -65,22 +65,21 @@ class TestAccountFollowup(TransactionCase): def run_wizard_three_times(self): cr, uid = self.cr, self.uid - current_date = datetime.datetime.now() + current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=40) result = current_date + delta self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) - self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) + self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) - self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) + self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), - 'followup_id': self.followup_id + 'followup_id': self.followup_id, }, context={"followup_id": self.followup_id}) - self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) - + self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) def test_01_send_followup_later_for_upgrade(self): """ Send one follow-up after 15 days to check it upgrades to level 1""" @@ -103,8 +102,8 @@ class TestAccountFollowup(TransactionCase): self.assertEqual(self.partner.browse(cr, uid, self.partner_id).payment_next_action, "Call the customer on the phone! ", "Manual action not set") self.assertEqual(self.partner.browse(cr, uid, self.partner_id).payment_next_action_date, - datetime.datetime.now().strftime("%Y-%m-%d")) - + datetime.datetime.utcnow().strftime("%Y-%m-%d")) + def test_03_filter_on_credit(self): """ Check the partners can be filtered on having credits """ cr, uid = self.cr, self.uid From e6e9f41be04e0ad6ec2535943b8647442453f386 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 20 Feb 2013 14:07:19 +0100 Subject: [PATCH 2/3] [IMP] Use UTC time everywhere bzr revid: jco@openerp.com-20130220130719-dk86iq5ty5incld7 --- addons/account_followup/tests/test_account_followup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py index f60f4d5a98c..804089f9093 100644 --- a/addons/account_followup/tests/test_account_followup.py +++ b/addons/account_followup/tests/test_account_followup.py @@ -53,7 +53,7 @@ class TestAccountFollowup(TransactionCase): def test_00_send_followup_after_3_days(self): """ Send follow up after 3 days and check nothing is done (as first follow-up level is only after 15 days)""" cr, uid = self.cr, self.uid - current_date = datetime.datetime.now() + current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=3) result = current_date + delta self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), @@ -84,14 +84,14 @@ class TestAccountFollowup(TransactionCase): def test_01_send_followup_later_for_upgrade(self): """ Send one follow-up after 15 days to check it upgrades to level 1""" cr, uid = self.cr, self.uid - current_date = datetime.datetime.now() + current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=15) result = current_date + delta self.wizard_id = self.wizard.create(cr, uid, { 'date':result.strftime("%Y-%m-%d"), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) - self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) + self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) self.assertEqual(self.partner.browse(cr, uid, self.partner_id).latest_followup_level_id.id, self.first_followup_line_id, "Not updated to the correct follow-up level") @@ -107,7 +107,7 @@ class TestAccountFollowup(TransactionCase): def test_03_filter_on_credit(self): """ Check the partners can be filtered on having credits """ cr, uid = self.cr, self.uid - ids = self.partner.search(cr, uid, [('payment_amount_due', '>=', 0.0)]) + ids = self.partner.search(cr, uid, [('payment_amount_due', '>', 0.0)]) self.assertIn(self.partner_id, ids) def test_04_action_done(self): @@ -139,7 +139,7 @@ class TestAccountFollowup(TransactionCase): """Run wizard until manual action, pay the invoice and check that partner has no follow-up level anymore and after running the wizard the action is empty""" cr, uid = self.cr, self.uid self.test_02_check_manual_action() - current_date = datetime.datetime.now() + current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=1) result = current_date + delta self.invoice.pay_and_reconcile(cr, uid, [self.invoice_id], 1000.0, self.pay_account_id, From d725e06524b82ad56aebe1d6401962a98a69b263 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 20 Feb 2013 15:44:03 +0100 Subject: [PATCH 3/3] [IMP] use DEFAULT_SERVER_DATE_FORMAT in tests bzr revid: jco@openerp.com-20130220144403-bl13qry2aeb1dwjx --- .../tests/test_account_followup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py index 804089f9093..8648c2b7621 100644 --- a/addons/account_followup/tests/test_account_followup.py +++ b/addons/account_followup/tests/test_account_followup.py @@ -56,7 +56,7 @@ class TestAccountFollowup(TransactionCase): current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=3) result = current_date + delta - self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), + self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) @@ -68,15 +68,15 @@ class TestAccountFollowup(TransactionCase): current_date = datetime.datetime.utcnow() delta = datetime.timedelta(days=40) result = current_date + delta - self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), + self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) - self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), + self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) - self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), + self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id, }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) @@ -88,7 +88,7 @@ class TestAccountFollowup(TransactionCase): delta = datetime.timedelta(days=15) result = current_date + delta self.wizard_id = self.wizard.create(cr, uid, { - 'date':result.strftime("%Y-%m-%d"), + 'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id, 'tz':'UTC'}) @@ -102,7 +102,7 @@ class TestAccountFollowup(TransactionCase): self.assertEqual(self.partner.browse(cr, uid, self.partner_id).payment_next_action, "Call the customer on the phone! ", "Manual action not set") self.assertEqual(self.partner.browse(cr, uid, self.partner_id).payment_next_action_date, - datetime.datetime.utcnow().strftime("%Y-%m-%d")) + datetime.datetime.utcnow().strftime(tools.DEFAULT_SERVER_DATE_FORMAT)) def test_03_filter_on_credit(self): """ Check the partners can be filtered on having credits """ @@ -147,7 +147,7 @@ class TestAccountFollowup(TransactionCase): self.period_id, self.journal_id, name = "Payment for test customer invoice follow-up") self.assertFalse(self.partner.browse(cr, uid, self.partner_id).latest_followup_level_id, "Level not empty") - self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime("%Y-%m-%d"), + self.wizard_id = self.wizard.create(cr, uid, {'date':result.strftime(tools.DEFAULT_SERVER_DATE_FORMAT), 'followup_id': self.followup_id }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id})