[Libreoffice-commits] core.git: solenv/gbuild

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 8 21:27:56 UTC 2021


 solenv/gbuild/UITest.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3bcaa4ba79477a21251ddaa06e0ea159196a7ffb
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Jun 8 21:32:54 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jun 8 23:27:06 2021 +0200

    Unset TZ when starting UITests on Windows
    
    This workarounds a problem that some tests in trackedChanges.py fail on Windows
    in specific time spans, at least in Europe/Moscow time zone: the change date in
    the dialog is reported according to local system time, while the expected date
    string is created in Python wrong, likely because datetime.datetime.now in the
    native Windows Python takes into account both system timezone data and the TZ
    environment variable coming from Cygwin (or some other kind of Python bug). The
    time reported by datetime.datetime.now was off by -2 hours, and resulting date
    string was wrong from 00:00 till 02:00.
    
    See upstream bug at https://bugs.python.org/issue44352.
    
    Change-Id: Ife3bcf000acac37f624a1065512513cc41dae596
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116862
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 92eaaf9faefb..0a08939239b8 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -76,6 +76,7 @@ else
 		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \
 		PYTHONDONTWRITEBYTECODE=0 \
 		$(if $(ENABLE_WERROR),PYTHONWARNINGS=error) \
+		$(if $(filter WNT,$(OS)),TZ=) \
 		$(gb_TEST_ENV_VARS) \
 		$(gb_UITest_COMMAND) \
 		--soffice="$(gb_UITest_SOFFICEARG)" \


More information about the Libreoffice-commits mailing list