From bd9ed0d5d3c003b13692d87871fa513eff0cd6e6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 5 Dec 2020 21:24:19 +0100 Subject: [PATCH] Fix testCoreProject_Methods test on Windows --- tests/conftest.py | 3 --- tests/test_core_project.py | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 5195b841..0d66d0ea 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,15 +6,12 @@ import sys import pytest import shutil import os -import time from dummy import DummyMain from PyQt5.QtWidgets import QMessageBox sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir))) -os.environ["TZ"] = "UTC" -time.tzset() from nw.config import Config # noqa: E402 diff --git a/tests/test_core_project.py b/tests/test_core_project.py index 869603fe..fe847983 100644 --- a/tests/test_core_project.py +++ b/tests/test_core_project.py @@ -14,6 +14,7 @@ from dummy import causeOSError from nw.core.project import NWProject from nw.constants import nwItemClass, nwItemType, nwItemLayout, nwFiles +from nw.common import formatTimeStamp @pytest.mark.core def testCoreProject_NewMinimal(fncDir, outDir, refDir, tmpDir, dummyGUI): @@ -842,8 +843,8 @@ def testCoreProject_Methods(monkeypatch, nwMinimal, dummyGUI, tmpDir): assert readFile(statsFile) == ( "# Offset 100\n" "# Start Time End Time Novel Notes\n" - "2020-09-13 13:00:00 2020-09-13 14:00:00 200 100\n" - ) + "%s %s 200 100\n" + ) % (formatTimeStamp(1600002000), formatTimeStamp(1600005600)) # Pack XML Value xElem = etree.Element("element")