[education/rkward/testing/win_citest_timeout] rkward: Trying to fix FreeBSD, now

Thomas Friedrichsmeier null at kde.org
Sun Oct 2 22:02:41 BST 2022


Git commit e3e05c625aa2f1e4dcbfbfba8b41a85b6147b374 by Thomas Friedrichsmeier.
Committed on 02/10/2022 at 21:02.
Pushed by tfry into branch 'testing/win_citest_timeout'.

Trying to fix FreeBSD, now

M  +0    -1    rkward/autotests/core_test.cpp
M  +1    -0    rkward/rbackend/rkfrontendtransmitter.cpp

https://invent.kde.org/education/rkward/commit/e3e05c625aa2f1e4dcbfbfba8b41a85b6147b374

diff --git a/rkward/autotests/core_test.cpp b/rkward/autotests/core_test.cpp
index 02287c01..763f69e0 100644
--- a/rkward/autotests/core_test.cpp
+++ b/rkward/autotests/core_test.cpp
@@ -290,7 +290,6 @@ private slots:
 		QVERIFY(RObjectList::getGlobalEnv()->findObject("x"));
 
 		QPointer<RInterface> oldiface = RInterface::instance();
-		RK_Debug::RK_Debug_Level = DL_TRACE;
 		restart_action->trigger();
 		while (oldiface) {  // action may be delayed until next event processing
 			qApp->processEvents();
diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index e8106bdf..68baf335 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -180,6 +180,7 @@ void RKFrontendTransmitter::run () {
 		RK_ASSERT (false);
 	} else if (connection->state() != QLocalSocket::UnconnectedState) {
 		connection->abort();
+		connection->waitForDisconnected(500);
 	}
 }
 


More information about the rkward-tracker mailing list