From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1446450-garchives=archives.gentoo.org@lists.gentoo.org>
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 47435158020
	for <garchives@archives.gentoo.org>; Wed, 12 Oct 2022 20:44:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2B387E099F;
	Wed, 12 Oct 2022 20:44:52 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 10E1AE099F
	for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 20:44:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 2B6F834127C
	for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 20:44:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CDCC619
	for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2022 20:44:48 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1665607460.685c48d1f13accd80509dfa52a62fb93606da62c.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild
X-VCS-Directories: net-nntp/sabnzbd/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 685c48d1f13accd80509dfa52a62fb93606da62c
X-VCS-Branch: master
Date: Wed, 12 Oct 2022 20:44:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ac9c9b32-7177-4d60-9ed7-5aedbf204889
X-Archives-Hash: a3d11548cdd42faa1807c9033f32d667

commit:     685c48d1f13accd80509dfa52a62fb93606da62c
Author:     Joe Kappus <joe <AT> wt <DOT> gd>
AuthorDate: Tue Oct 11 18:02:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 20:44:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685c48d1

net-nntp/sabnzbd: add pytest, fix deps

Merging Kangie's updates to allow for test.

Signed-off-by: Joe Kappus <joe <AT> wt.gd>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild | 52 +++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild
index 6f28bd82c53c..22552e21fdd2 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.6.1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 		dev-python/notify2[${PYTHON_USEDEP}]
 		dev-python/portend[${PYTHON_USEDEP}]
 		dev-python/puremagic[${PYTHON_USEDEP}]
-		>=dev-python/sabyenc-5.4.2[${PYTHON_USEDEP}]
+		<dev-python/sabyenc-6[${PYTHON_USEDEP}]
 	')
 "
 
@@ -53,11 +53,17 @@ BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
 			dev-python/pkginfo[${PYTHON_USEDEP}]
 			dev-python/pyfakefs[${PYTHON_USEDEP}]
 			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/selenium[${PYTHON_USEDEP}]
+			dev-python/tavalidate[${PYTHON_USEDEP}]
+			dev-python/tavern[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/xmltodict[${PYTHON_USEDEP}]
 		')
 		www-apps/chromedriver-bin
@@ -72,6 +78,42 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_test() {
+	local EPYTEST_IGNORE=(
+		# network sandbox
+		tests/test_getipaddress.py
+		tests/test_rss.py
+		tests/test_urlgrabber.py
+		tests/test_utils/test_happyeyeballs.py
+		tests/test_utils/test_internetspeed.py
+	)
+	local EPYTEST_DESELECT=(
+		# network sandbox
+		'tests/test_consistency.py::TestWiki'
+		# Just plain fails
+		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
+		# Chromedriver tests don't want to behave in portage
+		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
+		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
+		'tests/test_functional_config.py::TestConfigLogin::test_login'
+		'tests/test_functional_config.py::TestConfigCategories::test_page'
+		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
+		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
+		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
+		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
+		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
+	)
+	epytest -s
+}
+
+
+
 src_install() {
 	local d
 
@@ -102,14 +144,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
 }
 
-src_test() {
-	EPYTEST_IGNORE=(
-		# Requires dev-python/tavern which is not currently packaged for Gentoo
-		tests/test_functional_api.py
-	)
-	epytest
-}
-
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation