qml: interrupt node before GUI shutdown

Author: johnny9

qml/models/nodemodel.cpp

@@ -423,6 +423,7 @@ void NodeModel::requestShutdown()
     }
     m_shutdown_requested = true;
     stopShutdownPolling();
+    m_node.startShutdown();
     Q_EMIT requestedShutdown();
 }
 

test/functional/qml_wallet_test_lib.py

@@ -242,12 +242,19 @@ def start_gui(self, reset_gui_settings=False, extra_args=None, cwd=None):
 
     def stop_gui(self):
         if self.gui_process and self.gui_process.poll() is None:
-            self.gui_process.send_signal(signal.SIGTERM)
             try:
-                self.gui_process.wait(timeout=10)
+                rpc_call(self.gui_rpc_port, "stop")
+            except Exception:
+                pass
+            try:
+                self.gui_process.wait(timeout=20)
             except subprocess.TimeoutExpired:
-                self.gui_process.kill()
-                self.gui_process.wait()
+                self.gui_process.send_signal(signal.SIGTERM)
+                try:
+                    self.gui_process.wait(timeout=10)
+                except subprocess.TimeoutExpired:
+                    self.gui_process.kill()
+                    self.gui_process.wait()
         self.gui_process = None
         if self.driver:
             self.driver.close()

test/test_nodemodel.cpp

@@ -166,6 +166,7 @@ private Q_SLOTS:
     void nodeInformationRowsExposeDiagnostics();
     void initEmitsRequestedInitialize();
     void initGuardBlocksSecondEmission();
+    void shutdownPollingStartsShutdownBeforeEmittingSignal();
 };
 
 void NodeModelTests::refreshMempoolInfoUpdatesProperties()
@@ -1384,6 +1385,32 @@ void NodeModelTests::initGuardBlocksSecondEmission()
     QCOMPARE(spy.count(), 1);
 }
 
+void NodeModelTests::shutdownPollingStartsShutdownBeforeEmittingSignal()
+{
+    NiceMock<MockNode> node;
+    MempoolState mempool;
+    InstallDefaultHandlers(node);
+    InstallMempoolGetters(node, mempool);
+    ON_CALL(node, shutdownRequested()).WillByDefault(Return(true));
+
+    NodeModel model{node};
+    WaitForInitialMempoolRefresh(mempool);
+
+    QSignalSpy shutdown_spy{&model, &NodeModel::requestedShutdown};
+    bool started_before_signal{false};
+    EXPECT_CALL(node, startShutdown()).WillOnce(Invoke([&] {
+        started_before_signal = shutdown_spy.count() == 0;
+    }));
+
+    model.startShutdownPolling();
+
+    QTRY_COMPARE_WITH_TIMEOUT(shutdown_spy.count(), 1, ASYNC_TIMEOUT_MS);
+    QVERIFY(started_before_signal);
+
+    model.requestShutdown();
+    QCOMPARE(shutdown_spy.count(), 1);
+}
+
 #ifdef BITCOINQML_NO_TEST_MAIN
 BITCOINQML_REGISTER_QT_TEST(NodeModelTests)
 #else