monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-15 01:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tv test to init recently added ReleaseMap.

Browse source 
Fix double use of var `result` overwrites the return value and causes an error in _parse_custom_exceptions.
Change remove Python 3.7 from CI
This commit is contained in:
JackDandy 2023-05-04 21:44:24 +01:00
parent 2c784e215c
commit c75ef36cfe
3 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/unittest.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
matrix: matrix:
os: os:
- windows-latest - windows-latest
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] python-version: ['3.8', '3.9', '3.10', '3.11']
steps: steps:
- name: 'Set up Python ${{ matrix.python-version }}' - name: 'Set up Python ${{ matrix.python-version }}'
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@ -34,7 +34,7 @@ jobs:
matrix: matrix:
os: os:
- ubuntu-latest - ubuntu-latest
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] python-version: ['3.8', '3.9', '3.10', '3.11']
steps: steps:
- name: 'Set up Python ${{ matrix.python-version }}' - name: 'Set up Python ${{ matrix.python-version }}'
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@ -55,7 +55,7 @@ jobs:
matrix: matrix:
os: os:
- macos-latest - macos-latest
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] python-version: ['3.8', '3.9', '3.10', '3.11']
steps: steps:
- name: 'Set up Python ${{ matrix.python-version }}' - name: 'Set up Python ${{ matrix.python-version }}'
uses: actions/setup-python@v4 uses: actions/setup-python@v4

6
sickgear/scene_exceptions.py
View file

@ -362,11 +362,9 @@ class ReleaseMap(Job):
else: else:
used.add((cur_for_season, cur_for_episode)) used.add((cur_for_season, cur_for_episode))
if not sn or sn != (target_season, cur_target_episode): # not already set if not sn or sn != (target_season, cur_target_episode): # not already set
result = set_scene_numbering_helper( count_updated_numbers += int(bool(set_scene_numbering_helper(
tvid, prodid, for_season=cur_for_season, for_episode=cur_for_episode, tvid, prodid, for_season=cur_for_season, for_episode=cur_for_episode,
scene_season=target_season, scene_episode=cur_target_episode) scene_season=target_season, scene_episode=cur_target_episode).get('success')))
if result.get('success'):
count_updated_numbers += 1
cur_for_episode += 1 cur_for_episode += 1

70
tests/tv_tests.py
View file

@ -18,18 +18,18 @@
import unittest import unittest
import test_lib as test import test_lib as test
from random import randint from random import randint
import datetime import datetime
import copy import copy
import sickgear import sickgear
from sickgear.tv import TVEpisode, TVShow, TVidProdid, prodid_bitshift from sickgear.tv import TVEpisode, TVShow, TVidProdid, prodid_bitshift
from exceptions_helper import ex, MultipleShowObjectsException from exceptions_helper import MultipleShowObjectsException
from sickgear.helpers import find_show_by_id from sickgear.helpers import find_show_by_id
from sickgear import indexermapper from sickgear import indexermapper
from sickgear.indexers.indexer_api import TVInfoAPI from sickgear.indexers.indexer_api import TVInfoAPI
from sickgear.indexers.indexer_config import TVINFO_IMDB, TVINFO_TMDB, TVINFO_TRAKT, TVINFO_TVDB, TVINFO_TVMAZE, \ from sickgear.indexers.indexer_config import TVINFO_IMDB, TVINFO_TMDB, TVINFO_TVDB, TVINFO_TVMAZE, TVINFO_TVRAGE
TVINFO_TVRAGE from sickgear.scene_exceptions import ReleaseMap
# noinspection PyUnreachableCode # noinspection PyUnreachableCode
if False: if False:
@ -42,6 +42,7 @@ class TVShowTests(test.SickbeardTestDBCase):
super(TVShowTests, self).setUp() super(TVShowTests, self).setUp()
sickgear.showList = [] sickgear.showList = []
sickgear.showDict = {} sickgear.showDict = {}
_ = ReleaseMap()
def test_init_indexerid(self): def test_init_indexerid(self):
show_obj = TVShow(1, 1, 'en') show_obj = TVShow(1, 1, 'en')
@ -81,6 +82,7 @@ class TVEpisodeTests(test.SickbeardTestDBCase):
super(TVEpisodeTests, self).setUp() super(TVEpisodeTests, self).setUp()
sickgear.showList = [] sickgear.showList = []
sickgear.showDict = {} sickgear.showDict = {}
_ = ReleaseMap()
def test_init_empty_db(self): def test_init_empty_db(self):
show_obj = TVShow(1, 1, 'en') show_obj = TVShow(1, 1, 'en')
@ -200,36 +202,36 @@ shows = [{'tvid': TVINFO_TVDB, 'prodid': 123,
] ]
find_tests = [ find_tests = [
{'para': {'show_id': {TVINFO_TVMAZE: 22, TVINFO_TVRAGE: 785}, 'no_mapped_ids': False}, {'para': {'show_id': {TVINFO_TVMAZE: 22, TVINFO_TVRAGE: 785}, 'no_mapped_ids': False},
'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'search via mapped id'}, 'description': 'search via mapped id'},
{'para': {'show_id': {TVINFO_TVDB: 123}}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, {'para': {'show_id': {TVINFO_TVDB: 123}}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'simple standard search via main id dict'}, 'description': 'simple standard search via main id dict'},
{'para': {'show_id': {TVINFO_TVDB: 12345}}, 'result': None, {'para': {'show_id': {TVINFO_TVDB: 12345}}, 'result': None,
'description': 'simple standard search via main id dict, for non-existing show'}, 'description': 'simple standard search via main id dict, for non-existing show'},
{'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}, 'check_multishow': True}, {'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}, 'check_multishow': True},
'result': {'success': False}, 'result': {'success': False},
'description': 'search via 2 ids matching multiple shows and multi show check'}, 'description': 'search via 2 ids matching multiple shows and multi show check'},
{'para': {'show_id': {TVINFO_TVDB: 5555, TVINFO_TVMAZE: 123}, 'check_multishow': True}, {'para': {'show_id': {TVINFO_TVDB: 5555, TVINFO_TVMAZE: 123}, 'check_multishow': True},
'result': {'tvid': TVINFO_TVMAZE, 'prodid': 123}, 'result': {'tvid': TVINFO_TVMAZE, 'prodid': 123},
'description': 'search via 2 ids matching only 1 show and multi show check'}, 'description': 'search via 2 ids matching only 1 show and multi show check'},
{'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}}, {'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVMAZE: 123}},
'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'search via 2 ids matching only 1 show without multi show check #1'}, 'description': 'search via 2 ids matching only 1 show without multi show check #1'},
{'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVRAGE: 22}}, {'para': {'show_id': {TVINFO_TVDB: 123, TVINFO_TVRAGE: 22}},
'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'search via 2 ids matching only 1 show without multi show check #2'}, 'description': 'search via 2 ids matching only 1 show without multi show check #2'},
{'para': {'show_id': {TVINFO_TVMAZE: 22, TVINFO_TVRAGE: 785}}, {'para': {'show_id': {TVINFO_TVMAZE: 22, TVINFO_TVRAGE: 785}},
'result': None, 'result': None,
'description': 'search for 2 non-existing ids without mapping'}, 'description': 'search for 2 non-existing ids without mapping'},
{'para': {'show_id': {TVINFO_IMDB: 123}}, {'para': {'show_id': {TVINFO_IMDB: 123}},
'result': None, 'description': 'invalid sid search (tvid above tvid_bitmask)'}, 'result': None, 'description': 'invalid sid search (tvid above tvid_bitmask)'},
{'para': {'show_id': '%s:123' % TVINFO_TVDB}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, {'para': {'show_id': '%s:123' % TVINFO_TVDB}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'simple search via tvid_prodid string'}, 'description': 'simple search via tvid_prodid string'},
{'para': {'show_id': '%s:123' % TVINFO_TVDB, 'check_multishow': True}, {'para': {'show_id': '%s:123' % TVINFO_TVDB, 'check_multishow': True},
'result': {'tvid': TVINFO_TVDB, 'prodid': 123}, 'result': {'tvid': TVINFO_TVDB, 'prodid': 123},
'description': 'simple search via tvid_prodid string and check multishow'}, 'description': 'simple search via tvid_prodid string and check multishow'},
] ]
class TVFindTests(test.SickbeardTestDBCase): class TVFindTests(test.SickbeardTestDBCase):