Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26378 from ruchamahabal/fix-sla-test

Browse Source 
fix(tests): flaky SLA test and precision in Payment Entry test
This commit is contained in:
Rucha Mahabal 2021-07-08 21:09:21 +05:30 committed by GitHub
commit d1cb8d0bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/payment_entry/test_payment_entry.py
View File

@ -589,9 +589,9 @@ class TestPaymentEntry(unittest.TestCase):
party_account_balance = get_balance_on(account=pe.paid_from, cost_center=pe.cost_center) party_account_balance = get_balance_on(account=pe.paid_from, cost_center=pe.cost_center)
self.assertEqual(pe.cost_center, si.cost_center) self.assertEqual(pe.cost_center, si.cost_center)
self.assertEqual(expected_account_balance, account_balance) self.assertEqual(flt(expected_account_balance), account_balance)
self.assertEqual(expected_party_balance, party_balance) self.assertEqual(flt(expected_party_balance), party_balance)
self.assertEqual(expected_party_account_balance, party_account_balance) self.assertEqual(flt(expected_party_account_balance), party_account_balance)
def create_payment_terms_template(): def create_payment_terms_template():

5
erpnext/support/doctype/service_level_agreement/service_level_agreement.json
View File

@ -150,7 +150,8 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Document Type", "label": "Document Type",
"options": "DocType", "options": "DocType",
"reqd": 1 "reqd": 1,
"set_only_once": 1
}, },
{ {
"default": "1", "default": "1",
@ -178,7 +179,7 @@
} }
], ],
"links": [], "links": [],
"modified": "2021-05-29 13:35:41.956849", "modified": "2021-07-08 12:28:46.283334",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Service Level Agreement", "name": "Service Level Agreement",

13
erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
View File

@ -328,16 +328,11 @@ def create_service_level_agreement(default_service_level_agreement, holiday_list
"entity": entity "entity": entity
}) })
service_level_agreement_exists = frappe.db.exists("Service Level Agreement", filters) sla = frappe.db.exists("Service Level Agreement", filters)
if sla:
frappe.delete_doc("Service Level Agreement", sla, force=1)
if not service_level_agreement_exists: return frappe.get_doc(service_level_agreement).insert(ignore_permissions=True)
doc = frappe.get_doc(service_level_agreement).insert(ignore_permissions=True)
else:
doc = frappe.get_doc("Service Level Agreement", service_level_agreement_exists)
doc.update(service_level_agreement)
doc.save()
return doc
def create_customer(): def create_customer():