Skip to content

Improve PythonQt test cleanup consistency and add alternative cleanup order test #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2025
Merged

Improve PythonQt test cleanup consistency and add alternative cleanup order test #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58ac5db
style(PythonQtTestCleanup): Consistently indent test cases
jcfr Sep 10, 2025
39fcb2a
chore(PythonQtTestCleanup): Consistently use helper to run test scripts
jcfr Sep 10, 2025
ae3efa6
tests: Update PythonQtTestCleanup to test alternative cleanup order
jcfr Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions tests/PythonQtTestCleanup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@ void PythonQtTestCleanup::testCallQtMethodInDestructorOwnedQTimer()

void PythonQtTestCleanup::testCallQtMethodInDestructorWeakRefGuarded()
{
QVERIFY(_helper->runScript(
"import weakref\n" \
"import PythonQt.QtCore\n" \
"class TimerWrapper(object):\n" \
" def __init__(self):\n" \
" self.timerWeakRef = weakref.ref(PythonQt.QtCore.QTimer())\n" \
" def __del__(self):\n" \
" if self.timerWeakRef():\n" \
" self.timerWeakRef().setSingleShot(True)\n" \
"x = TimerWrapper()\n" \
"obj.setPassed()\n"
));
QVERIFY(_helper->runScript(
"import weakref\n" \
"import PythonQt.QtCore\n" \
"class TimerWrapper(object):\n" \
" def __init__(self):\n" \
" self.timerWeakRef = weakref.ref(PythonQt.QtCore.QTimer())\n" \
" def __del__(self):\n" \
" if self.timerWeakRef():\n" \
" self.timerWeakRef().setSingleShot(True)\n" \
"x = TimerWrapper()\n" \
"obj.setPassed()\n"
));
}

void PythonQtTestCleanup::testSignalReceiverCleanup()
Expand All @@ -81,11 +81,21 @@ void PythonQtTestCleanup::testSignalReceiverCleanup()

// Test that PythonQtSignalReceiver is cleaned up properly,
// i.e. PythonQt::cleanup() doesn't segfault
main.evalScript(
QVERIFY(_helper->runScript(
"import PythonQt.QtCore\n" \
"timer = PythonQt.QtCore.QTimer(obj)\n" \
"timer.connect('destroyed()', obj.onDestroyed)\n"
);
"timer.connect('destroyed()', obj.onDestroyed)\n" \
"obj.setPassed()\n"
));
}

void PythonQtTestCleanup::testPyFinalizeThenPythonQtCleanup()
{
if (Py_IsInitialized()) {
Py_Finalize();
}

PythonQt::cleanup();
}

bool PythonQtTestCleanupHelper::runScript(const char* script)
Expand Down
1 change: 1 addition & 0 deletions tests/PythonQtTestCleanup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ private Q_SLOTS:
void testCallQtMethodInDestructorOwnedQTimer();
void testCallQtMethodInDestructorWeakRefGuarded();
void testSignalReceiverCleanup();
void testPyFinalizeThenPythonQtCleanup();

private:
PythonQtTestCleanupHelper* _helper;
Expand Down
Loading