1 |
commit: 300b1793a88d651323e8e32fe04e3c425bad8bc5 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu May 26 18:11:42 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 20:29:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300b1793 |
7 |
|
8 |
dev-python/pytest-qt: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/25643 |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../pytest-qt-3.3.0-fix-file-match-test.patch | 13 -------- |
16 |
.../pytest-qt-3.3.0-skip-show-window-test.patch | 36 ---------------------- |
17 |
2 files changed, 49 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch |
20 |
deleted file mode 100644 |
21 |
index cbdeb80c1c56..000000000000 |
22 |
--- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch |
23 |
+++ /dev/null |
24 |
@@ -1,13 +0,0 @@ |
25 |
-diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py |
26 |
-index ef9371c..becd3ae 100644 |
27 |
---- a/tests/test_modeltest.py |
28 |
-+++ b/tests/test_modeltest.py |
29 |
-@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir): |
30 |
- "test_qt_tester_invalid.py:*: Qt modeltester errors", |
31 |
- "*-- Captured Qt messages --*", |
32 |
- "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE " |
33 |
-- "(qabstractitemmodeltester.cpp:*)", |
34 |
-+ "(*qabstractitemmodeltester.cpp:*)", |
35 |
- "*-- Captured stdout call --*", |
36 |
- "modeltest: Using Qt C++ tester", |
37 |
- "*== 1 failed in * ==*", |
38 |
|
39 |
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch |
40 |
deleted file mode 100644 |
41 |
index 1acef2bb4922..000000000000 |
42 |
--- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch |
43 |
+++ /dev/null |
44 |
@@ -1,36 +0,0 @@ |
45 |
-diff --git a/tests/test_basics.py b/tests/test_basics.py |
46 |
-index 7fdaf93..a972ea0 100644 |
47 |
---- a/tests/test_basics.py |
48 |
-+++ b/tests/test_basics.py |
49 |
-@@ -82,31 +82,6 @@ def test_stop_for_interaction(qtbot, timer): |
50 |
- qtbot.stopForInteraction() |
51 |
- |
52 |
- |
53 |
--@×××××××××××.parametrize("show", [True, False]) |
54 |
--@×××××××××××.parametrize("method_name", ["waitExposed", "waitActive"]) |
55 |
--def test_wait_window(show, method_name, qtbot): |
56 |
-- """ |
57 |
-- Using one of the wait-widget methods should not raise anything if the widget |
58 |
-- is properly displayed, otherwise should raise a TimeoutError. |
59 |
-- """ |
60 |
-- method = getattr(qtbot, method_name) |
61 |
-- if qt_api.pytest_qt_api != "pyqt5": |
62 |
-- with pytest.raises(RuntimeError) as exc_info: |
63 |
-- with method(None, None): |
64 |
-- pass |
65 |
-- assert str(exc_info.value) == "Available in PyQt5 only" |
66 |
-- else: |
67 |
-- widget = qt_api.QWidget() |
68 |
-- qtbot.add_widget(widget) |
69 |
-- if show: |
70 |
-- with method(widget, timeout=1000): |
71 |
-- widget.show() |
72 |
-- else: |
73 |
-- with pytest.raises(qtbot.TimeoutError): |
74 |
-- with method(widget, timeout=100): |
75 |
-- pass |
76 |
-- |
77 |
-- |
78 |
- @pytest.mark.parametrize("method_name", ["waitExposed", "waitActive"]) |
79 |
- def test_wait_window_propagates_other_exception(method_name, qtbot): |
80 |
- """ |