From 9584109b86be118df6cd6bdd4b07b55bd5147695 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 21 Mar 2013 14:18:24 +0100 Subject: [PATCH] [IMP] cleanup of Yaml files: do not translate assert messages bzr revid: rco@openerp.com-20130321131824-422cc4mk2bm9yrw8 --- addons/account/test/account_bank_statement.yml | 2 +- addons/account/test/account_use_model.yml | 6 +++--- addons/hr_payroll/test/payslip.yml | 3 +-- addons/hr_payroll_account/test/hr_payroll_account.yml | 6 ++---- addons/membership/test/test_membership.yml | 6 ++---- addons/mrp_repair/test/test_mrp_repair_afterinv.yml | 2 +- addons/mrp_repair/test/test_mrp_repair_b4inv.yml | 2 +- addons/mrp_repair/test/test_mrp_repair_noneinv.yml | 2 +- addons/sale_mrp/test/sale_mrp.yml | 7 +++---- addons/stock_location/test/stock_location_push_flow.yml | 6 ++---- 10 files changed, 17 insertions(+), 25 deletions(-) diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml index cbd35be438a..3711cff4d56 100644 --- a/addons/account/test/account_bank_statement.yml +++ b/addons/account/test/account_bank_statement.yml @@ -7,7 +7,7 @@ import time journal = self._default_journal_id(cr, uid, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'journal_type': 'bank', 'period_id': time.strftime('%m'), 'active_ids': [ref('menu_bank_statement_tree')], 'active_id': ref('menu_bank_statement_tree')}) - assert journal, _('Journal has not been selected') + assert journal, 'Journal has not been selected' - I create a bank statement with Opening and Closing balance 0. - diff --git a/addons/account/test/account_use_model.yml b/addons/account/test/account_use_model.yml index ab69b251919..16153cd6f8c 100644 --- a/addons/account/test/account_use_model.yml +++ b/addons/account/test/account_use_model.yml @@ -41,7 +41,7 @@ ids = self.search(cr, uid, [('ref', '=', 'My Test Model')]) self.button_validate(cr, uid, ids, {}) moves = self.browse(cr, uid, ids)[0] - assert(moves.state == 'posted'), _('Journal Entries are not in posted state') + assert(moves.state == 'posted'), 'Journal Entries are not in posted state' - Then I create Recurring Lines - @@ -57,7 +57,7 @@ self.compute(cr, uid, [ref('test_recurring_lines')], {'lang': u'en_US', 'active_model': 'ir.ui.menu', 'active_ids': [ref('menu_action_subscription_form')], 'tz': False, 'active_id': ref('menu_action_subscription_form')}) subscription_lines = subscription_line_obj.search(cr, uid, [('subscription_id', '=', ref('test_recurring_lines'))]) - assert subscription_lines, _('Subscription lines has not been created') + assert subscription_lines, 'Subscription lines has not been created' - I provide date in 'Generate Entries' wizard - @@ -69,5 +69,5 @@ !python {model: account.subscription.generate}: | res = self.action_generate(cr, uid, [ref('account_subscription_generate')], {'lang': u'en_US', 'active_model': 'ir.ui.menu', 'active_ids': [ref('menu_generate_subscription')], 'tz': False, 'active_id': ref('menu_generate_subscription')}) - assert res, _('Move for subscription lines has not been created') + assert res, 'Move for subscription lines has not been created' diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml index 0e60a5b6af4..f78ad4a374d 100644 --- a/addons/hr_payroll/test/payslip.yml +++ b/addons/hr_payroll/test/payslip.yml @@ -68,9 +68,8 @@ I verify that the payslip is in done state - !python {model: hr.payslip}: | - from openerp.tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) - assert(payslip_brw.state == 'done'), _('State not changed!') + assert(payslip_brw.state == 'done'), 'State not changed!' - I want to check refund payslip so I click on refund button. - diff --git a/addons/hr_payroll_account/test/hr_payroll_account.yml b/addons/hr_payroll_account/test/hr_payroll_account.yml index c8b6bf42fdd..c637b5f319a 100644 --- a/addons/hr_payroll_account/test/hr_payroll_account.yml +++ b/addons/hr_payroll_account/test/hr_payroll_account.yml @@ -89,9 +89,8 @@ I verify the payslip is in draft state. - !python {model: hr.payslip}: | - from openerp.tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) - assert(payslip_brw.state == 'draft'), _('State not changed!') + assert(payslip_brw.state == 'draft'), 'State not changed!' - I click on "Compute Sheet" button. - @@ -120,7 +119,6 @@ I verify that the payslip is in done state. - !python {model: hr.payslip}: | - from openerp.tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) - assert(payslip_brw.state == 'done'), _('State not changed!') + assert(payslip_brw.state == 'done'), 'State not changed!' diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml index 40d1785c29a..489b8b06afb 100644 --- a/addons/membership/test/test_membership.yml +++ b/addons/membership/test/test_membership.yml @@ -31,7 +31,6 @@ I'm Opening that Invoice which is created for "Seagate". - !python {model: res.partner}: | - from openerp.tools.translate import _ invoice_pool = self.pool.get('account.invoice') partner_pool = self.pool.get('res.partner') membership_line_pool = self.pool.get('membership.membership_line') @@ -39,7 +38,7 @@ membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('base.res_partner_19'))]) membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids) - assert membership_lines, _('Membership is not registrated.') + assert membership_lines, 'Membership is not registrated.' membership_line = membership_lines[0] invoice_pool.signal_invoice_open(cr, uid, [membership_line.account_invoice_id.id]) @@ -105,7 +104,6 @@ I'm doing to make credit note of invoice which is paid by "Seagate" to cancel membership. - !python {model: account.invoice}: | - from openerp.tools.translate import _ invoice_pool = self.pool.get('account.invoice') partner_pool = self.pool.get('res.partner') membership_line_pool = self.pool.get('membership.membership_line') @@ -114,7 +112,7 @@ membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('base.res_partner_19'))]) membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids) - assert membership_lines, _('Membership is not registrated.') + assert membership_lines, 'Membership is not registrated.' membership_line = membership_lines[0] refund_id = invoice_refund_pool.create(cr, uid, {'description': 'Refund of Membership', 'filter_refund': 'refund'}, {'active_id': membership_line.account_invoice_id.id}) invoice_refund_pool.invoice_refund(cr, uid, [refund_id], {'active_id': membership_line.account_invoice_id.id, 'active_ids': [membership_line.account_invoice_id.id]}) diff --git a/addons/mrp_repair/test/test_mrp_repair_afterinv.yml b/addons/mrp_repair/test/test_mrp_repair_afterinv.yml index 5ceb3f9b02b..eed121050b8 100644 --- a/addons/mrp_repair/test/test_mrp_repair_afterinv.yml +++ b/addons/mrp_repair/test/test_mrp_repair_afterinv.yml @@ -33,4 +33,4 @@ - !python {model: mrp.repair}: | repair_id = self.browse(cr, uid, [ref('mrp_repair_rmrp0')], context=context)[0] - assert repair_id.invoice_id.id, _("No invoice exists for this repair order") + assert repair_id.invoice_id.id, "No invoice exists for this repair order" diff --git a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml index 47e301cd0bd..83badf48be9 100644 --- a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml +++ b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml @@ -18,7 +18,7 @@ - !python {model: mrp.repair}: | repair_id = self.browse(cr, uid, [ref('mrp_repair_rmrp2')], context=context)[0] - assert repair_id.invoice_id.id, _("No invoice exists for this repair order.") + assert repair_id.invoice_id.id, "No invoice exists for this repair order." - I start the Repairing process by clicking on "Start Repair" button. - diff --git a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml index 4334af01958..b8006d0d485 100644 --- a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml +++ b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml @@ -23,5 +23,5 @@ - !python {model: mrp.repair}: | repair_id = self.browse(cr, uid, [ref('mrp_repair_rmrp1')], context=context)[0] - assert not repair_id.invoice_id.id, _("Invoice should not be exists for this repair order") + assert not repair_id.invoice_id.id, "Invoice should not be exists for this repair order" diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml index 9b70e052854..5be5210b623 100644 --- a/addons/sale_mrp/test/sale_mrp.yml +++ b/addons/sale_mrp/test/sale_mrp.yml @@ -92,11 +92,10 @@ I verify that a procurement has been generated for sale order - !python {model: procurement.order}: | - from openerp.tools.translate import _ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name)]) - assert proc_ids, _('No Procurements!') + assert proc_ids, 'No Procurements!' - Then I click on the "Run Procurement" button - @@ -112,7 +111,7 @@ sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')]) - assert proc_ids, _('Procurement is not in the running state!') + assert proc_ids, 'Procurement is not in the running state!' - I verify that a manufacturing order has been generated, and that its name and reference are correct - @@ -120,7 +119,7 @@ mnf_obj = self.pool.get('mrp.production') so = self.browse(cr, uid, ref("sale_order_so0")) mnf_id = mnf_obj.search(cr, uid, [('origin','=',so.name)]) - assert mnf_id, _('Manufacturing order has not been generated') + assert mnf_id, 'Manufacturing order has not been generated' mo = mnf_obj.browse(cr, uid, mnf_id)[0] assert mo.sale_name == so.name, 'Wrong Name for the Manufacturing Order. Expected %s, Got %s' % (so.name, mo.name) assert mo.sale_ref == so.client_order_ref, 'Wrong Sale Reference for the Manufacturing Order' diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml index 27164848f77..64bd30e0c99 100644 --- a/addons/stock_location/test/stock_location_push_flow.yml +++ b/addons/stock_location/test/stock_location_push_flow.yml @@ -94,12 +94,11 @@ I check the move is in waiting state. - !python {model: stock.picking }: | - from openerp.tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) for move in pick.move_lines: - assert(move.state == 'waiting'), _('Stock is not in waiting state') + assert(move.state == 'waiting'), 'Stock is not in waiting state' - I receive the order of the supplier Micro Link Technologies from the Incoming Shipments menu. - @@ -123,8 +122,7 @@ I check the Outgoing Orders is automatically done. - !python {model: stock.picking }: | - from openerp.tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) - assert(pick.state == 'done'), _('Picking is not in done state') + assert(pick.state == 'done'), 'Picking is not in done state'