From c4010b0581ce60f547eb6d0f1cc15e7c58f67239 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2026 22:31:16 +0000 Subject: [PATCH] ci: fix timezone for python mariadb tests (backport #54464) (#54465) ci: fix timezone for python mariadb tests (#54464) (cherry picked from commit 0d2da6d86c99e3dd7c39f9959fea0d1c627b127f) Co-authored-by: diptanilsaha --- .github/workflows/server-tests-mariadb.yml | 2 ++ erpnext/tests/utils.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/server-tests-mariadb.yml b/.github/workflows/server-tests-mariadb.yml index b8e88d1b5f3..cfef2e05f5b 100644 --- a/.github/workflows/server-tests-mariadb.yml +++ b/.github/workflows/server-tests-mariadb.yml @@ -41,6 +41,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 env: + TZ: 'Asia/Kolkata' NODE_ENV: "production" WITH_COVERAGE: ${{ github.event_name != 'pull_request' }} @@ -56,6 +57,7 @@ jobs: mysql: image: mariadb:10.6 env: + TZ: 'Asia/Kolkata' MARIADB_ROOT_PASSWORD: 'root' ports: - 3306:3306 diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py index 15c89a24b4f..297caa15b98 100644 --- a/erpnext/tests/utils.py +++ b/erpnext/tests/utils.py @@ -151,6 +151,7 @@ class BootStrapTestData: frappe.db.commit() # nosemgrep def make_master_data(self): + self.update_system_settings() self.make_fiscal_year() self.make_holiday_list() self.make_company() @@ -203,7 +204,6 @@ class BootStrapTestData: self.update_support_settings() self.update_selling_settings() self.update_stock_settings() - self.update_system_settings() frappe.db.commit() # nosemgrep