From 89cf28fade7ef4a757d400213f2ce4884ece4867 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 15 Feb 2021 16:57:56 +0100 Subject: [PATCH] Make tests work on github actions default language code --- tests/test_base/test_base_config.py | 6 +++--- tests/test_gui/test_gui_preferences.py | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/test_base/test_base_config.py b/tests/test_base/test_base_config.py index 7b0b6f4f..10ca038d 100644 --- a/tests/test_base/test_base_config.py +++ b/tests/test_base/test_base_config.py @@ -145,7 +145,7 @@ def testBaseConfig_Init(monkeypatch, tmpDir, fncDir, outDir, refDir): assert os.path.isfile(confFile) copyfile(confFile, testFile) - assert cmpFiles(testFile, compFile, [2, 9]) + assert cmpFiles(testFile, compFile, [2, 9, 10]) monkeypatch.undo() # Load and save with OSError @@ -193,7 +193,7 @@ def testBaseConfig_Init(monkeypatch, tmpDir, fncDir, outDir, refDir): assert tstConf.saveConfig() copyfile(confFile, testFile) - assert cmpFiles(testFile, compFile, [2, 9]) + assert cmpFiles(testFile, compFile, [2, 9, 10]) # END Test testBaseConfig_Init @@ -458,7 +458,7 @@ def testBaseConfig_SettersGetters(tmpConf, tmpDir, outDir, refDir): assert not tmpConf.confChanged copyfile(confFile, testFile) - assert cmpFiles(testFile, compFile, [2, 9]) + assert cmpFiles(testFile, compFile, [2, 9, 10]) # END Test testBaseConfig_SettersGetters diff --git a/tests/test_gui/test_gui_preferences.py b/tests/test_gui/test_gui_preferences.py index 266022ea..1611499d 100644 --- a/tests/test_gui/test_gui_preferences.py +++ b/tests/test_gui/test_gui_preferences.py @@ -245,13 +245,7 @@ def testGuiPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir): testFile = os.path.join(outDir, "guiPreferences_novelwriter.conf") compFile = os.path.join(refDir, "guiPreferences_novelwriter.conf") copyfile(projFile, testFile) - ignoreLines = [ - 2, # Timestamp - 9, # Release Notes - 13, 14, 15, 16, # Window sizes - 17, 18, 19, 20, # Window sizes - 7, 30, 31, # Fonts (depends on system default) - ] + ignoreLines = [2, 9, 10, 13, 14, 15, 16, 17, 18, 19, 20, 7, 30, 31] assert cmpFiles(testFile, compFile, ignoreLines) # Clean up