Skip to content

Commit 91caa79

Browse files
committed
resolve deprecation warning
1 parent 43caa13 commit 91caa79

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

tests/test_app.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from path import Path
22
import os, sys, asyncio
33

4+
from pytestqt.qtbot import QtBot
5+
46
if sys.platform == 'win32':
57
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
68

@@ -124,7 +126,7 @@ def get_rgba(ais):
124126
return color.redF(), color.greenF(), color.blueF(), alpha
125127

126128
@pytest.fixture
127-
def main(qtbot,mocker):
129+
def main(qtbot: QtBot, mocker):
128130

129131
mocker.patch.object(QMessageBox, 'question', return_value=QMessageBox.Yes)
130132

@@ -142,48 +144,45 @@ def main(qtbot,mocker):
142144
return qtbot, win
143145

144146
@pytest.fixture
145-
def main_clean(qtbot,mocker):
147+
def main_clean(qtbot: QtBot, mocker):
146148

147149
mocker.patch.object(QMessageBox, 'question', return_value=QMessageBox.Yes)
148150

149151
win = MainWindow()
150-
win.show()
151-
152152
qtbot.addWidget(win)
153-
qtbot.waitForWindowShown(win)
153+
with qtbot.waitExposed(win):
154+
win.show()
154155

155156
editor = win.components['editor']
156157
editor.set_text(code)
157158

158159
return qtbot, win
159160

160161
@pytest.fixture
161-
def main_clean_do_not_close(qtbot,mocker):
162+
def main_clean_do_not_close(qtbot: QtBot, mocker):
162163

163164
mocker.patch.object(QMessageBox, 'question', return_value=QMessageBox.No)
164165

165166
win = MainWindow()
166-
win.show()
167-
168167
qtbot.addWidget(win)
169-
qtbot.waitForWindowShown(win)
168+
with qtbot.waitExposed(win):
169+
win.show()
170170

171171
editor = win.components['editor']
172172
editor.set_text(code)
173173

174174
return qtbot, win
175175

176176
@pytest.fixture
177-
def main_multi(qtbot,mocker):
177+
def main_multi(qtbot: QtBot, mocker):
178178

179179
mocker.patch.object(QMessageBox, 'question', return_value=QMessageBox.Yes)
180180
mocker.patch.object(QFileDialog, 'getSaveFileName', return_value=('out.step',''))
181181

182182
win = MainWindow()
183-
win.show()
184-
185183
qtbot.addWidget(win)
186-
qtbot.waitForWindowShown(win)
184+
with qtbot.waitExposed(win):
185+
win.show()
187186

188187
editor = win.components['editor']
189188
editor.set_text(code_multi)
@@ -571,7 +570,7 @@ def test_traceback(main):
571570
assert(traceback_view.tree.root.childCount() == 3) # 1 in user code + 2 in CQ code
572571

573572
@pytest.fixture
574-
def editor(qtbot):
573+
def editor(qtbot: QtBot):
575574

576575
win = Editor()
577576
win.show()

0 commit comments

Comments
 (0)