Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into features/footnotes

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-21 23:34:56 +02:00
parent 48e653a546 a195cfc792
commit 0d294f49f9
19 changed files with 881 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_base/test_base_init.py
+3 -7
View File
@@ -46,7 +46,6 @@ def testBaseInit_Launch(caplog, monkeypatch, fncPath):
mp.setitem(sys.modules, "Foundation", None)
nwGUI = main(["--testmode", f"--config={fncPath}", f"--data={fncPath}"])
assert isinstance(nwGUI, MockGuiMain)
assert "Failed" in caplog.text
CONFIG.osDarwin = osDarwin
@@ -58,9 +57,6 @@ def testBaseInit_Launch(caplog, monkeypatch, fncPath):
mp.setitem(sys.modules, "ctypes", None)
nwGUI = main(["--testmode", f"--config={fncPath}", f"--data={fncPath}"])
assert isinstance(nwGUI, MockGuiMain)
if not sys.platform.startswith("darwin"):
# For some reason, the test doesn't work on macOS
assert "Failed" in caplog.text
CONFIG.osWindows = osWindows
@@ -161,9 +157,9 @@ def testBaseInit_Imports(caplog, monkeypatch, fncPath):
["--testmode", f"--config={fncPath}", f"--data={fncPath}"]
)
assert ex.value.code & 4 == 4 # Python version not satisfied
assert ex.value.code & 8 == 8 # Qt version not satisfied
assert ex.value.code & 16 == 16 # PyQt version not satisfied
assert ex.value.code & 4 == 4 # Python version not satisfied # type: ignore
assert ex.value.code & 8 == 8 # Qt version not satisfied # type: ignore
assert ex.value.code & 16 == 16 # PyQt version not satisfied # type: ignore
assert "At least Python" in caplog.messages[0]
assert "At least Qt5" in caplog.messages[1]