test: change of test utility (backport #2660) by mergify[bot] · Pull Request #4276 · resilient-tech/india-compliance

mergify · 2026-04-30T13:59:35Z

This is an automatic backport of pull request #2660 done by [Mergify](https://mergify.com).

(cherry picked from commit 48ba8b6) # Conflicts: # india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py # india_compliance/gst_india/doctype/gst_return_log/test_gst_return_log.py # india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py # india_compliance/gst_india/doctype/gstin/test_gstin.py # india_compliance/gst_india/doctype/gstr_3b_report/test_gstr_3b_report.py # india_compliance/gst_india/overrides/test_advance_payment_entry.py # india_compliance/gst_india/overrides/test_ineligible_itc.py # india_compliance/gst_india/overrides/test_purchase_invoice.py # india_compliance/gst_india/overrides/test_setup_wizard.py # india_compliance/gst_india/overrides/test_subcontracting_transaction.py # india_compliance/gst_india/overrides/test_transaction.py # india_compliance/gst_india/utils/gstr_2/test_gstr_2a.py # india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v3_0.py # india_compliance/gst_india/utils/test_e_invoice.py # india_compliance/gst_india/utils/test_e_waybill.py # india_compliance/gst_india/utils/test_utils.py

(cherry picked from commit c67e9aa) # Conflicts: # .github/workflows/server-tests.yml

(cherry picked from commit 9d7ce33)

(cherry picked from commit 98e77f4) # Conflicts: # india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py # india_compliance/gst_india/utils/test_gstin_info.py

mergify · 2026-04-30T13:59:37Z

Cherry-pick of 48ba8b6 has failed:

On branch mergify/bp/version-15-hotfix/pr-2660
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 48ba8b67.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   india_compliance/audit_trail/overrides/test_account_settings.py
	modified:   india_compliance/audit_trail/overrides/test_property_setter.py
	modified:   india_compliance/audit_trail/overrides/test_version.py
	modified:   india_compliance/gst_india/doctype/e_invoice_log/test_e_invoice_log.py
	modified:   india_compliance/gst_india/doctype/e_waybill_log/test_e_waybill_log.py
	modified:   india_compliance/gst_india/doctype/gst_hsn_code/test_gst_hsn_code.py
	modified:   india_compliance/gst_india/doctype/gst_inward_supply/test_gst_inward_supply.py
	modified:   india_compliance/gst_india/doctype/gstr_1_beta/test_gstr_1_beta.py
	modified:   india_compliance/gst_india/doctype/gstr_import_log/test_gstr_import_log.py
	modified:   india_compliance/gst_india/doctype/pan/test_pan.py
	modified:   india_compliance/gst_india/doctype/purchase_reconciliation_tool/test_purchase_reconciliation_tool.py
	modified:   india_compliance/gst_india/overrides/test_company.py
	modified:   india_compliance/gst_india/overrides/test_item_tax_template.py
	modified:   india_compliance/gst_india/overrides/test_party.py
	modified:   india_compliance/gst_india/overrides/test_transaction_data.py
	modified:   india_compliance/gst_india/report/gst_sales_register_beta/test_sales_register_beta.py
	modified:   india_compliance/gst_india/report/gstr_1/test_gstr_1.py
	modified:   india_compliance/gst_india/utils/gstr_1/test_gstr_1_json_map.py
	modified:   india_compliance/test_patches.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py
	both modified:   india_compliance/gst_india/doctype/gst_return_log/test_gst_return_log.py
	both modified:   india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py
	both modified:   india_compliance/gst_india/doctype/gstin/test_gstin.py
	both modified:   india_compliance/gst_india/doctype/gstr_3b_report/test_gstr_3b_report.py
	both modified:   india_compliance/gst_india/overrides/test_advance_payment_entry.py
	both modified:   india_compliance/gst_india/overrides/test_ineligible_itc.py
	both modified:   india_compliance/gst_india/overrides/test_purchase_invoice.py
	deleted by us:   india_compliance/gst_india/overrides/test_setup_wizard.py
	both modified:   india_compliance/gst_india/overrides/test_subcontracting_transaction.py
	both modified:   india_compliance/gst_india/overrides/test_transaction.py
	both modified:   india_compliance/gst_india/utils/gstr_2/test_gstr_2a.py
	both modified:   india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v3_0.py
	both modified:   india_compliance/gst_india/utils/test_e_invoice.py
	both modified:   india_compliance/gst_india/utils/test_e_waybill.py
	both modified:   india_compliance/gst_india/utils/test_utils.py

Cherry-pick of c67e9aa has failed:

On branch mergify/bp/version-15-hotfix/pr-2660
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c67e9aa9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   india_compliance/tests/test_records.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/server-tests.yml

Cherry-pick of 98e77f4 has failed:

On branch mergify/bp/version-15-hotfix/pr-2660
Your branch is ahead of 'origin/version-15-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 98e77f4e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py
	modified:   india_compliance/gst_india/doctype/gst_hsn_code/test_gst_hsn_code.py
	modified:   india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py
	modified:   india_compliance/gst_india/doctype/gstin/test_gstin.py
	modified:   india_compliance/gst_india/doctype/purchase_reconciliation_tool/test_purchase_reconciliation_tool.py
	modified:   india_compliance/gst_india/overrides/test_sales_invoice.py
	modified:   india_compliance/tests/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py
	both modified:   india_compliance/gst_india/utils/test_gstin_info.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

codacy-production · 2026-04-30T14:00:40Z

Not up to standards ⛔

🔴 Issues 34 critical · 21 minor

Alerts:
⚠ 55 issues (≤ 0 issues of at least minor severity)

Results:
55 new issues

Category Results

Security 34 critical

CodeStyle 21 minor

View in Codacy

🟢 Metrics 0 complexity

Metric Results

Complexity 0

View in Codacy

_{NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer}
_{TIP This summary will be updated as you push new changes.}

greptile-apps · 2026-04-30T14:02:09Z

Confidence Score: 0/5

This PR is not safe to merge — unresolved merge conflict markers in 21 files will cause immediate SyntaxErrors and CI workflow failure.

Multiple P0 findings: raw Git conflict markers committed into Python source files and the CI YAML make every affected module unparseable. No test in those files can run, and the GitHub Actions workflow is invalid.

All ~20 Python test files with conflict markers, and .github/workflows/server-tests.yml.

Important Files Changed

Filename	Overview
.github/workflows/server-tests.yml	Contains a raw Git merge conflict block — invalid YAML that will prevent the CI workflow from running.
india_compliance/gst_india/overrides/test_transaction.py	Contains 3 unresolved Git conflict blocks; Python cannot parse this file and all tests within it will fail.
india_compliance/gst_india/overrides/test_purchase_invoice.py	Contains 2 unresolved Git conflict blocks making the file unparseable.
india_compliance/gst_india/overrides/test_advance_payment_entry.py	Contains 2 unresolved Git conflict blocks making the file unparseable.
india_compliance/gst_india/overrides/test_subcontracting_transaction.py	Contains 2 unresolved Git conflict blocks making the file unparseable.
india_compliance/tests/init.py	Updates import from `frappe.test_runner` to `frappe.tests.utils` — clean change, no conflicts.
india_compliance/tests/test_records.json	Adds `stock_uom: "Nos"` to 4 item records and removes 3 POS Profile test records.
india_compliance/gst_india/overrides/test_sales_invoice.py	Migrates base class from `unittest.TestCase` to `IntegrationTestCase` — no conflicts, clean change.
india_compliance/gst_india/overrides/test_setup_wizard.py	New test file using `IntegrationTestCase` — no conflicts.

_{Reviews (1): Last reviewed commit: "test: fix other dependencies for test ca..." | Re-trigger Greptile}

greptile-apps · 2026-04-30T14:02:14Z

+<<<<<<< HEAD
    services:
      mariadb:
        image: mariadb:10.6


Unresolved Git merge conflict markers

This file contains raw Git conflict markers (<<<<<<< HEAD, =======, >>>>>>> c67e9aa9) that were left unresolved during the automated backport. The YAML is invalid and this workflow will not parse or execute at all.

greptile-apps · 2026-04-30T14:02:17Z

+<<<<<<< HEAD
+=======
+from frappe.tests import IntegrationTestCase, change_settings
+from frappe.utils import today
+>>>>>>> 48ba8b67 (test: change of test utility)
 from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import (


Unresolved Git merge conflict markers throughout the file

This file contains 3 unresolved conflict blocks (<<<<<<< HEAD / ======= / >>>>>>> 48ba8b67). Python will raise a SyntaxError when importing this module, so none of the test classes (TestTransaction, TestQuotationTransaction, TestSpecificTransactions, TestItemUpdate) will run. The same pattern appears in ~20 other files in this PR: test_purchase_invoice.py, test_advance_payment_entry.py, test_subcontracting_transaction.py, and others.

vorasmit added 4 commits April 30, 2026 13:59

test: change command for running tests

09a9c0d

(cherry picked from commit c67e9aa) # Conflicts: # .github/workflows/server-tests.yml

test: property setters removed when changed to default

d4ce98a

(cherry picked from commit 9d7ce33)

test: fix other dependencies for test cases

46933ea

(cherry picked from commit 98e77f4) # Conflicts: # india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py # india_compliance/gst_india/utils/test_gstin_info.py

mergify Bot added the conflicts label Apr 30, 2026

mergify Bot mentioned this pull request Apr 30, 2026

test: change of test utility #2660

Merged

ljain112 closed this Apr 30, 2026

greptile-apps Bot reviewed Apr 30, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: change of test utility (backport #2660)#4276

test: change of test utility (backport #2660)#4276
mergify[bot] wants to merge 4 commits intoversion-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-2660

mergify Bot commented Apr 30, 2026

Uh oh!

mergify Bot commented Apr 30, 2026

Uh oh!

codacy-production Bot commented Apr 30, 2026

Uh oh!

greptile-apps Bot commented Apr 30, 2026

Important Files Changed

Uh oh!

greptile-apps Bot Apr 30, 2026

Uh oh!

greptile-apps Bot Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

mergify Bot commented Apr 30, 2026

Uh oh!

mergify Bot commented Apr 30, 2026

Uh oh!

codacy-production Bot commented Apr 30, 2026

Not up to standards ⛔

Uh oh!

greptile-apps Bot commented Apr 30, 2026

Confidence Score: 0/5

Important Files Changed

Uh oh!

greptile-apps Bot Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

greptile-apps Bot Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants