From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C0C3158091 for ; Thu, 26 May 2022 20:31:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1981E0826; Thu, 26 May 2022 20:31:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C893E0826 for ; Thu, 26 May 2022 20:31:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84ABE341AA1 for ; Thu, 26 May 2022 20:31:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B4573B8 for ; Thu, 26 May 2022 20:31:33 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1653596985.300b1793a88d651323e8e32fe04e3c425bad8bc5.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-qt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch X-VCS-Directories: dev-python/pytest-qt/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 300b1793a88d651323e8e32fe04e3c425bad8bc5 X-VCS-Branch: master Date: Thu, 26 May 2022 20:31:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42d829d0-a262-422f-a77d-85d18fca2c7d X-Archives-Hash: 0b1e1ea845378a2d6cf6d2684fab4aad commit: 300b1793a88d651323e8e32fe04e3c425bad8bc5 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu May 26 18:11:42 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Thu May 26 20:29:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300b1793 dev-python/pytest-qt: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25643 Signed-off-by: Conrad Kostecki gentoo.org> .../pytest-qt-3.3.0-fix-file-match-test.patch | 13 -------- .../pytest-qt-3.3.0-skip-show-window-test.patch | 36 ---------------------- 2 files changed, 49 deletions(-) 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 deleted file mode 100644 index cbdeb80c1c56..000000000000 --- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py -index ef9371c..becd3ae 100644 ---- a/tests/test_modeltest.py -+++ b/tests/test_modeltest.py -@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir): - "test_qt_tester_invalid.py:*: Qt modeltester errors", - "*-- Captured Qt messages --*", - "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE " -- "(qabstractitemmodeltester.cpp:*)", -+ "(*qabstractitemmodeltester.cpp:*)", - "*-- Captured stdout call --*", - "modeltest: Using Qt C++ tester", - "*== 1 failed in * ==*", 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 deleted file mode 100644 index 1acef2bb4922..000000000000 --- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/tests/test_basics.py b/tests/test_basics.py -index 7fdaf93..a972ea0 100644 ---- a/tests/test_basics.py -+++ b/tests/test_basics.py -@@ -82,31 +82,6 @@ def test_stop_for_interaction(qtbot, timer): - qtbot.stopForInteraction() - - --@pytest.mark.parametrize("show", [True, False]) --@pytest.mark.parametrize("method_name", ["waitExposed", "waitActive"]) --def test_wait_window(show, method_name, qtbot): -- """ -- Using one of the wait-widget methods should not raise anything if the widget -- is properly displayed, otherwise should raise a TimeoutError. -- """ -- method = getattr(qtbot, method_name) -- if qt_api.pytest_qt_api != "pyqt5": -- with pytest.raises(RuntimeError) as exc_info: -- with method(None, None): -- pass -- assert str(exc_info.value) == "Available in PyQt5 only" -- else: -- widget = qt_api.QWidget() -- qtbot.add_widget(widget) -- if show: -- with method(widget, timeout=1000): -- widget.show() -- else: -- with pytest.raises(qtbot.TimeoutError): -- with method(widget, timeout=100): -- pass -- -- - @pytest.mark.parametrize("method_name", ["waitExposed", "waitActive"]) - def test_wait_window_propagates_other_exception(method_name, qtbot): - """