stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix tests

Browse Source
This commit is contained in:
mac12m99
2021-01-25 13:37:02 +01:00
parent 2c84897674
commit 03a5253e0e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/httptools.py
View File

@@ -418,7 +418,7 @@ def downloadpage(url, **opt):
response['data'] = response['data'].decode('ISO-8859-1') response['data'] = response['data'].decode('ISO-8859-1')
if req.headers.get('Server', '').startswith('cloudflare') and response_code in [429, 503, 403]\ if req.headers.get('Server', '').startswith('cloudflare') and response_code in [429, 503, 403]\
and not opt.get('CF', False) and 'Please turn JavaScript on and reload the page' in response['data']: and not opt.get('CF', False) and 'Cloudflare Ray ID' in response['data']:
logger.debug("CF retry... for domain: %s" % domain) logger.debug("CF retry... for domain: %s" % domain)
from lib import proxytranslate from lib import proxytranslate
gResp = proxytranslate.process_request_proxy(url) gResp = proxytranslate.process_request_proxy(url)

15
tests/test_generic.py
View File

@@ -53,6 +53,7 @@ from core import servertools
import channelselector import channelselector
import re import re
outDir = os.path.join(os.getcwd(), 'reports')
validUrlRegex = re.compile( validUrlRegex = re.compile(
r'^(?:http|ftp)s?://' # http:// or https:// r'^(?:http|ftp)s?://' # http:// or https://
r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' # domain... r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' # domain...
@@ -144,7 +145,7 @@ channels = []
channel_list = channelselector.filterchannels("all") if 'KOD_TST_CH' not in os.environ else [Item(channel=os.environ['KOD_TST_CH'], action="mainlist")] channel_list = channelselector.filterchannels("all") if 'KOD_TST_CH' not in os.environ else [Item(channel=os.environ['KOD_TST_CH'], action="mainlist")]
logger.info([c.channel for c in channel_list]) logger.info([c.channel for c in channel_list])
ret = [] results = []
logger.record = True logger.record = True
for chItem in channel_list: for chItem in channel_list:
@@ -209,6 +210,11 @@ for chItem in channel_list:
logMenu[it.title] = logger.recordedLog logMenu[it.title] = logger.recordedLog
logger.recordedLog = '' logger.recordedLog = ''
results.append(
{'ch': ch, 'hasChannelConfig': hasChannelConfig, 'mainlist': [it.title for it in mainlist],
'menuItemlist': {k: [it.tojson() if type(it) == Item else it for it in menuItemlist[k]] for k in menuItemlist.keys()},
'serversFound': {k: [it.tojson() if type(it) == Item else it for it in menuItemlist[k]] for k in menuItemlist.keys()},
'module': str(module), 'logMenu': logMenu, 'error': error})
channels.append( channels.append(
{'ch': ch, 'hasChannelConfig': hasChannelConfig, 'mainlist': mainlist, 'menuItemlist': menuItemlist, {'ch': ch, 'hasChannelConfig': hasChannelConfig, 'mainlist': mainlist, 'menuItemlist': menuItemlist,
'serversFound': serversFound, 'module': module, 'logMenu': logMenu, 'error': error}) 'serversFound': serversFound, 'module': module, 'logMenu': logMenu, 'error': error})
@@ -217,8 +223,9 @@ logger.record = False
from specials import news from specials import news
dictNewsChannels, any_active = news.get_channels_list() dictNewsChannels, any_active = news.get_channels_list()
os.mkdir(os.path.join(os.getcwd(), 'reports')) if not os.path.isdir(outDir):
json.dump(channels, open(os.path.join(os.getcwd(), 'reports', 'result.json'), 'w')) os.mkdir(outDir)
json.dump(results, open(os.path.join(outDir, 'result.json'), 'w'))
# only 1 server item for single server # only 1 server item for single server
serverNames = [] serverNames = []
serversFinal = [] serversFinal = []
@@ -351,6 +358,6 @@ if __name__ == '__main__':
unittest.main(testRunner=HtmlTestRunner.HTMLTestRunner(report_name='report', add_timestamp=False, combine_reports=True, unittest.main(testRunner=HtmlTestRunner.HTMLTestRunner(report_name='report', add_timestamp=False, combine_reports=True,
report_title='KoD Test Suite', template=os.path.join(config.get_runtime_path(), 'tests', 'template.html')), exit=False) report_title='KoD Test Suite', template=os.path.join(config.get_runtime_path(), 'tests', 'template.html')), exit=False)
import webbrowser import webbrowser
webbrowser.open(os.path.join(config.get_runtime_path(), 'reports', 'report.html')) webbrowser.open(os.path.join(outDir, 'report.html'))
else: else:
unittest.main() unittest.main()