From 794a6f44545381e5ad230a99d1fcf858da978db2 Mon Sep 17 00:00:00 2001 From: jcfp Date: Sat, 30 Jan 2021 14:25:53 +0100 Subject: [PATCH] fix another script validation issue (#1774) * fix another script validation issue * add test for changing script to str None * cleanup change_script tests --- sabnzbd/nzbqueue.py | 2 +- tests/test_functional_api.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sabnzbd/nzbqueue.py b/sabnzbd/nzbqueue.py index e58486e..a20049a 100644 --- a/sabnzbd/nzbqueue.py +++ b/sabnzbd/nzbqueue.py @@ -276,7 +276,7 @@ class NzbQueue: def change_script(self, nzo_ids: str, script: str) -> int: result = 0 - if is_valid_script(script): + if (script is None) or is_valid_script(script): for nzo_id in [item.strip() for item in nzo_ids.split(",")]: if nzo_id in self.__nzo_table: self.__nzo_table[nzo_id].script = script diff --git a/tests/test_functional_api.py b/tests/test_functional_api.py index 1a28a03..61afa4e 100644 --- a/tests/test_functional_api.py +++ b/tests/test_functional_api.py @@ -715,8 +715,8 @@ class TestQueueApi(ApiTestFunctions): False, marks=pytest.mark.skipif(sys.platform.startswith("win"), reason="Not for Windows"), ), - (None, True, False), - ("", True, False), + ("None", False, True), + ("", False, False), ], ) def test_api_queue_change_job_script(self, script_filename, create_scriptfile, should_work):