gentoo auto-resync : 20:02:2023 - 20:21:39

3 files changed, 138 insertions, 3 deletions

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index dc6d9b82852e..9fe727fded16 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,3 +1,4 @@
+AUX sabnzbd-3.7.2-tavern-2.patch 5773 BLAKE2B 20bfd9bae283d9e520b83962cfcd4558cb9b2d77923b430870ba979ff3cab06920cc2049a2a4370953d92d392543468b7dc128b5d4dff9cc80d17ba6d95aee7a SHA512 e040b0ac4803f26cf04ff4ec162f111aad3593ae936dc86322398d5738a8048578e19fe444c8ec8e374e5b7fbd5f6b9a4c0edbd081805166cef9baff81f51e97
 AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19953d572a8369e89ff268d1d92fa1625c9bf684199c6211309667c552d63297c4f01bf40f48332f6 SHA512 ef5cbb8fd8bd9a5636cd082a59e0f31d989bafa4a17b4d87ed6c66254f43b05c759bd021e8c1ea5c2ac24e5538e82dc45199f8cacfb25403a882a8e80259c6d9
 AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
@@ -5,5 +6,5 @@ AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e
 DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
 DIST SABnzbd-3.7.2-src.tar.gz 5108729 BLAKE2B 8c279663f5395b613e7122e349971994f98b3ef22d23f18083b64864bc6e27653ca525a59226d2af5dc10a8cfd7509014c60e5b322137239e6eec03239746768 SHA512 d5fa9dc1a3114bd0806e580a170552fb8821e375790c2b95c7add4b25a4ceabad24111c4d6a9c12bcc9447dc0a5cbf6a8595e0142a74ee9d161849a9e55609e9
 EBUILD sabnzbd-3.7.1.ebuild 4786 BLAKE2B 5e627a67df321770413b02bce15201eca1b1e4ea136dbc9577dafd57fd1ac6ec2a6e99d2fd890c3a826bdf8beaa747f60a519b2b0b2e175fbaf8675370e2c258 SHA512 7f9d136ade530658bd45c1cd2f285c05c3ab1eafaaedafd9ca568cc4599dffdca01788c649adfbde9d911da23db42d6b6a823b18b1e9b3a019be1f063e89178a
-EBUILD sabnzbd-3.7.2.ebuild 4787 BLAKE2B fabdddabac1ee0d2c8d6b2a926233a3c6052cccf41f13639c3720248304739ebe78d71ee7fdf39350017e94d8c3cff8bd9d29372f2857614cba1e378aeb357cb SHA512 bd11d59d2628ff52e313d4fe11631b62968b70d6d9a646b38fc3db9e1584c1c3a1dad5ddc3890c409e3f3860c946d4ec38946177473194fb5c7b50dd7b622687
+EBUILD sabnzbd-3.7.2.ebuild 4956 BLAKE2B 10d306e467e4d68c411adba667f6ad642cfb5a2d865f97eddbaabfba2457a509b494b82010a3004744fd414365338a49d6f4ad419efaa0f8d7291709f662c352 SHA512 26278a32746aeefec731efadd8a8be202f0acf295de86e485063f31cc36f4522b935edba2597bb70bbbd2dbd6e989841735bbba590a24a2de7011dd3946c5aef
 MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
new file mode 100644
index 000000000000..60945d596d41
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
@@ -0,0 +1,128 @@
+From c8125e93bfb0963876992cb50c2442220c0ec300 Mon Sep 17 00:00:00 2001
+From: jcfp <jcfp@debian.org>
+Date: Mon, 20 Feb 2023 16:29:34 +0100
+Subject: [PATCH] convert tests to tavern 2.0.0+
+
+---
+ tests/data/tavern/api_get_files_format.yaml | 2 +-
+ tests/data/tavern/api_history_empty.yaml    | 2 +-
+ tests/data/tavern/api_history_format.yaml   | 2 +-
+ tests/data/tavern/api_queue_empty.yaml      | 2 +-
+ tests/data/tavern/api_queue_format.yaml     | 2 +-
+ tests/data/tavern/api_server_stats.yaml     | 2 +-
+ tests/data/tavern/api_version.yaml          | 4 ++--
+ tests/requirements.txt                      | 2 +-
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/data/tavern/api_get_files_format.yaml b/tests/data/tavern/api_get_files_format.yaml
+index e46823085b..9315fc27f8 100755
+--- a/tests/data/tavern/api_get_files_format.yaml
++++ b/tests/data/tavern/api_get_files_format.yaml
+@@ -56,7 +56,7 @@ stages:
+         pragma: "no-cache"
+         access-control-allow-origin: "*"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           # Verify response parameters with a regex using positive
+           # looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_history_empty.yaml b/tests/data/tavern/api_history_empty.yaml
+index 0d15faabd5..22fa4e4511 100755
+--- a/tests/data/tavern/api_history_empty.yaml
++++ b/tests/data/tavern/api_history_empty.yaml
+@@ -54,7 +54,7 @@ stages:
+         access-control-allow-origin: "*"
+         content-length: !re_match "[0-9]+"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           # Verify response with a regex using positive looksaheads so
+           # parameters match regardless of their order of appearance
+diff --git a/tests/data/tavern/api_history_format.yaml b/tests/data/tavern/api_history_format.yaml
+index 99c64098e1..45de020706 100755
+--- a/tests/data/tavern/api_history_format.yaml
++++ b/tests/data/tavern/api_history_format.yaml
+@@ -87,7 +87,7 @@ stages:
+         access-control-allow-origin: "*"
+         content-length: !re_match "[0-9]+"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           # Verify response parameters with a regex using positive looksaheads,
+           # so parameters match regardless of their order of appearance. Note
+diff --git a/tests/data/tavern/api_queue_empty.yaml b/tests/data/tavern/api_queue_empty.yaml
+index d80d026e0e..5a3f45e2ea 100755
+--- a/tests/data/tavern/api_queue_empty.yaml
++++ b/tests/data/tavern/api_queue_empty.yaml
+@@ -78,7 +78,7 @@ stages:
+         access-control-allow-origin: "*"
+         content-length: !re_match "[0-9]+"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           # Verify only a bunch of key response parameters with a regex using
+           # positive looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_queue_format.yaml b/tests/data/tavern/api_queue_format.yaml
+index 8411f4a272..fcbe708785 100755
+--- a/tests/data/tavern/api_queue_format.yaml
++++ b/tests/data/tavern/api_queue_format.yaml
+@@ -98,7 +98,7 @@ stages:
+         access-control-allow-origin: "*"
+         content-length: !re_match "[0-9]+"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           # Verify only a bunch of key response parameters with a regex using
+           # positive looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_server_stats.yaml b/tests/data/tavern/api_server_stats.yaml
+index b42a1f2a38..a94a3b7823 100755
+--- a/tests/data/tavern/api_server_stats.yaml
++++ b/tests/data/tavern/api_server_stats.yaml
+@@ -47,7 +47,7 @@ stages:
+         content-length: !re_match "[0-9]+"
+       status_code: 200
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           expression: "{{(?=.*'total': [0-9]+)(?=.*'month': [0-9]+)(?=.*'week': [0-9]+)(?=.*'day': [0-9]+)(?=.*'servers': .*).*}}"
+ 
+diff --git a/tests/data/tavern/api_version.yaml b/tests/data/tavern/api_version.yaml
+index ca11906cc9..8e81493353 100755
+--- a/tests/data/tavern/api_version.yaml
++++ b/tests/data/tavern/api_version.yaml
+@@ -35,7 +35,7 @@ stages:
+         content-type: !re_match "text/plain"
+         content-type: !re_search "charset=(UTF|utf)-8"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           expression: "{SAB_VERSION}"
+ 
+@@ -53,6 +53,6 @@ stages:
+         content-type: !re_match "text/xml"
+         content-type: !re_search "charset=(UTF|utf)-8"
+       verify_response_with:
+-        function: tavern.testutils.helpers:validate_regex
++        function: tavern.helpers:validate_regex
+         extra_kwargs:
+           expression: '<\?xml version="1.0" encoding="UTF-8" \?>\r?\n?<version>{SAB_VERSION}</version>'
+diff --git a/tests/requirements.txt b/tests/requirements.txt
+index ea2fe6c403..60c160fe40 100644
+--- a/tests/requirements.txt
++++ b/tests/requirements.txt
+@@ -9,7 +9,7 @@ pytest-httpbin
+ pytest-httpserver
+ flaky
+ xmltodict
+-tavern<2.0.0 # tavalidate does not support tavern 2.0.0+
++tavern>=2.0.0
+ tavalidate
+ importlib_metadata
+ lxml
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
index b12e490fa79a..f9a876c654e3 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 		dev-python/portend[${PYTHON_USEDEP}]
 		dev-python/puremagic[${PYTHON_USEDEP}]
 		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
+		dev-python/tavalidate[${PYTHON_USEDEP}]
+		>=dev-python/tavern-2[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="
@@ -71,6 +73,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tavern-2.patch
+)
+
 src_test() {
 	local EPYTEST_IGNORE=(
 		# network sandbox
@@ -79,8 +85,6 @@ src_test() {
 		tests/test_urlgrabber.py
 		tests/test_utils/test_happyeyeballs.py
 		tests/test_utils/test_internetspeed.py
-		# requires tavern
-		tests/test_functional_api.py
 	)
 	local EPYTEST_DESELECT=(
 		# network sandbox
@@ -106,6 +110,8 @@ src_test() {
 		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
 	)
 
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=tavern._core.pytest
 	epytest -s
 }