Working error test, but cannot properly test exception handler
This commit is contained in:
+3
-1
@@ -54,9 +54,11 @@ class Config:
|
||||
# Set Application Variables
|
||||
self.appName = "novelWriter"
|
||||
self.appHandle = self.appName.lower()
|
||||
self.cmdOpen = None
|
||||
|
||||
# Debug Settings
|
||||
self.showGUI = True
|
||||
self.debugInfo = False
|
||||
self.cmdOpen = None
|
||||
|
||||
# Config Error Handling
|
||||
self.hasError = False
|
||||
|
||||
+3
-2
@@ -138,6 +138,7 @@ class NWErrorMessage(QDialog):
|
||||
def exceptionHandler(exType, exValue, exTrace):
|
||||
"""Function to catch unhandled global exceptions.
|
||||
"""
|
||||
import nw
|
||||
import logging
|
||||
from traceback import print_tb
|
||||
from PyQt5.QtWidgets import qApp
|
||||
@@ -158,9 +159,9 @@ def exceptionHandler(exType, exValue, exTrace):
|
||||
return
|
||||
|
||||
errMsg = NWErrorMessage(nwGUI)
|
||||
nwGUI.activeDialog = errMsg
|
||||
errMsg.setMessage(exType, exValue, exTrace)
|
||||
errMsg.exec_()
|
||||
if nw.CONFIG.showGUI:
|
||||
errMsg.exec_()
|
||||
|
||||
try:
|
||||
# Try a controlled shudown
|
||||
|
||||
@@ -17,9 +17,7 @@ from nw.gui import (
|
||||
GuiDocMerge, GuiDocSplit, GuiWritingStats, GuiProjectWizard,
|
||||
GuiProjectLoad
|
||||
)
|
||||
from nw.constants import (
|
||||
nwItemType, nwItemLayout, nwItemClass
|
||||
)
|
||||
from nw.constants import nwItemType, nwItemLayout, nwItemClass
|
||||
|
||||
keyDelay = 2
|
||||
stepDelay = 20
|
||||
|
||||
+4
-22
@@ -6,21 +6,20 @@ import nw
|
||||
import sys
|
||||
import pytest
|
||||
|
||||
from nwtools import getGuiItem
|
||||
from PyQt5.QtWidgets import qApp
|
||||
|
||||
from PyQt5.QtCore import Qt, QTimer
|
||||
from PyQt5.QtWidgets import qApp, QDialogButtonBox
|
||||
|
||||
from nw.error import NWErrorMessage, exceptionHandler
|
||||
from nw.error import NWErrorMessage
|
||||
|
||||
@pytest.mark.error
|
||||
def testErrorDialog(qtbot, nwFuncTemp, nwTemp):
|
||||
qApp.closeAllWindows()
|
||||
nwGUI = nw.main(["--testmode", "--config=%s" % nwFuncTemp, "--data=%s" % nwTemp])
|
||||
qtbot.addWidget(nwGUI)
|
||||
nwGUI.show()
|
||||
qtbot.waitForWindowShown(nwGUI)
|
||||
|
||||
nwErr = NWErrorMessage(nwGUI)
|
||||
qtbot.addWidget(nwErr)
|
||||
nwErr.show()
|
||||
|
||||
# Invalid Error
|
||||
@@ -35,23 +34,6 @@ def testErrorDialog(qtbot, nwFuncTemp, nwTemp):
|
||||
assert "Exception" in theMessage
|
||||
nwErr._doClose()
|
||||
nwErr.close()
|
||||
del nwErr
|
||||
|
||||
# Exception Handler
|
||||
def handleDialog():
|
||||
while not isinstance(nwGUI.activeDialog, NWErrorMessage):
|
||||
qApp.processEvents()
|
||||
|
||||
nwErr = nwGUI.activeDialog
|
||||
theMessage = nwErr.msgBody.toPlainText()
|
||||
assert theMessage
|
||||
assert "Second Error" in theMessage
|
||||
assert "Exception" in theMessage
|
||||
btnClose = nwErr.btnBox.button(QDialogButtonBox.Close)
|
||||
qtbot.mouseClick(btnClose, Qt.LeftButton, delay=1)
|
||||
|
||||
QTimer.singleShot(0, handleDialog)
|
||||
exceptionHandler(Exception, "Second Error", sys.last_traceback)
|
||||
|
||||
nwGUI.closeMain()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user