Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: sitescripts/subscriptions/test/test_updateMalwareDomainsList.py

Issue 29821558: Issue #6707 - Make the generated malware domain filter list encode domains as Punycode (Closed)
Patch Set: updated tests Created July 3, 2018, 4:39 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-present eyeo GmbH 2 # Copyright (C) 2006-present eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 @pytest.fixture(autouse=True) 52 @pytest.fixture(autouse=True)
53 def urlopen(mocker): 53 def urlopen(mocker):
54 """Mock urlopen function""" 54 """Mock urlopen function"""
55 real_urlopen = urllib2.urlopen 55 real_urlopen = urllib2.urlopen
56 56
57 def mock_urlopen(url): 57 def mock_urlopen(url):
58 if url.startswith('good'): 58 if url.startswith('good'):
59 zf_data = io.BytesIO() 59 zf_data = io.BytesIO()
60 with zipfile.ZipFile(zf_data, 'w') as zf: 60 with zipfile.ZipFile(zf_data, 'w') as zf:
61 zf.writestr('justdomains', 'success\n') 61 idna_urls = ['xn--xhq02ykwbp4a.cn', 'xn--fiq80yua78t.tw']
62 zf.writestr('justdomains', '\n'.join(idna_urls) + '\n')
62 return io.BytesIO(zf_data.getvalue()) 63 return io.BytesIO(zf_data.getvalue())
63 if url.startswith('bad'): 64 if url.startswith('bad'):
64 raise urllib2.HTTPError('Bad', '42', 'No good', [], None) 65 raise urllib2.HTTPError('Bad', '42', 'No good', [], None)
65 if url.startswith('ugly'): 66 if url.startswith('ugly'):
66 raise urllib2.URLError('Ugly') 67 raise urllib2.URLError('Ugly')
67 return real_urlopen(url) 68 return real_urlopen(url)
68 69
69 mocker.patch('urllib2.urlopen', mock_urlopen) 70 mocker.patch('urllib2.urlopen', mock_urlopen)
70 71
71 72
72 def test_good(md_repo): 73 def test_good(md_repo):
73 main() 74 main()
74 subprocess.check_call(['hg', 'up'], cwd=md_repo.strpath) 75 subprocess.check_call(['hg', 'up'], cwd=md_repo.strpath)
75 result = md_repo.join('malwaredomains_full.txt').read() 76 result = md_repo.join('malwaredomains_full.txt').read()
76 assert 'success' in result 77 puny_urls = ['.cn-w48dx81cufdl6b', '.tw-u68dw51cgbz81a']
78 for url in puny_urls:
79 assert url in result
77 80
78 81
79 def test_bad(md_repo, config): 82 def test_bad(md_repo, config):
80 config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad') 83 config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad')
81 try: 84 try:
82 main() 85 main()
83 except SystemExit as exc: 86 except SystemExit as exc:
84 err_lines = str(exc).splitlines() 87 err_lines = str(exc).splitlines()
85 assert len(err_lines) == 3 88 assert len(err_lines) == 3
86 assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2] 89 assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2]
87 assert '42: No good' in err_lines[2] 90 assert '42: No good' in err_lines[2]
88 91
89 92
90 def test_ugly(md_repo, config): 93 def test_ugly(md_repo, config):
91 config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad\nugly') 94 config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad\nugly')
92 try: 95 try:
93 main() 96 main()
94 except SystemExit as exc: 97 except SystemExit as exc:
95 err_lines = str(exc).splitlines() 98 err_lines = str(exc).splitlines()
96 assert len(err_lines) == 4 99 assert len(err_lines) == 4
97 assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2] 100 assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2]
98 assert 'Failed to fetch ugly/files/justdomains.zip' in err_lines[3] 101 assert 'Failed to fetch ugly/files/justdomains.zip' in err_lines[3]
99 assert 'Ugly' in err_lines[3] 102 assert 'Ugly' in err_lines[3]
OLDNEW

Powered by Google App Engine
This is Rietveld