Trying warning box to fix the pytest hang

Author: jmwright

cq_editor/main_window.py

@@ -219,17 +219,20 @@ def closeEvent(self, event):
 
         if self.components["editor"].document().isModified():
 
-            dlg = QMessageBox(self)
-            dlg.setWindowTitle("Unsaved changes")
-            dlg.setText("Save changes before closing?")
-            dlg.setStandardButtons(
-                QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel
+            rv = QMessageBox.warning(
+                self,
+                "Unsaved changes",
+                "Save changes before closing?",
+                QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel,
+                QMessageBox.Save,
             )
-            dlg.setDefaultButton(QMessageBox.Save)
-            rv = dlg.exec_()
 
             if rv == QMessageBox.Save:
                 self.components["editor"].save()
+                if self.components["editor"].document().isModified():
+                    # Save As was cancelled - abort the close.
+                    event.ignore()
+                    return
                 event.accept()
                 super(MainWindow, self).closeEvent(event)
             elif rv == QMessageBox.Discard:

tests/test_app.py

@@ -162,7 +162,7 @@ def main_clean(qtbot, mocker):
 def main_clean_do_not_close(qtbot, mocker):
 
     mocker.patch.object(QMessageBox, "question", return_value=QMessageBox.No)
-    mocker.patch.object(QMessageBox, "exec_", return_value=QMessageBox.Cancel)
+    mocker.patch.object(QMessageBox, "warning", return_value=QMessageBox.Cancel)
 
     win = MainWindow()
     win.show()
@@ -180,7 +180,7 @@ def main_clean_do_not_close(qtbot, mocker):
 def main_multi(qtbot, mocker):
 
     mocker.patch.object(QMessageBox, "question", return_value=QMessageBox.Yes)
-    mocker.patch.object(QMessageBox, "exec_", return_value=QMessageBox.Discard)
+    mocker.patch.object(QMessageBox, "warning", return_value=QMessageBox.Discard)
     mocker.patch.object(QFileDialog, "getSaveFileName", return_value=("out.step", ""))
 
     win = MainWindow()