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

Unified Diff: sitescripts/subscriptions/test/test_updateMalwareDomainsList.py

Issue 29370984: Fixes 4784 - Improve error reporting in updateMalwareDomainsList and add tests (Closed)
Patch Set: Created Jan. 10, 2017, 6:08 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sitescripts/subscriptions/test/test_updateMalwareDomainsList.py
===================================================================
new file mode 100644
--- /dev/null
+++ b/sitescripts/subscriptions/test/test_updateMalwareDomainsList.py
@@ -0,0 +1,95 @@
+# This file is part of the Adblock Plus web scripts,
+# Copyright (C) 2006-2016 Eyeo GmbH
+#
+# Adblock Plus is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# Adblock Plus is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
+
+import io
+import ConfigParser
+import subprocess
+import urllib2
+import zipfile
+
+import pytest
+
+from sitescripts.subscriptions.bin.updateMalwareDomainsList import main
+
+CONF_SECTION = 'subscriptionDownloads'
+
+
+@pytest.fixture(autouse=True)
+def md_repo(tmpdir):
+ """A mock of our malware domains repo"""
+ repo_dir = tmpdir.mkdir('md_repo')
+ repo_dir.join('foo').write('foo')
+ subprocess.check_call(['hg', 'init'], cwd=repo_dir.strpath)
+ subprocess.check_call(['hg', 'commit', '-q', '-m', 'foo', '-A'],
+ cwd=repo_dir.strpath)
+ return repo_dir
+
+
+@pytest.fixture(autouse=True)
+def config(mocker, md_repo):
+ """A mock of sitescripts config"""
+ config = ConfigParser.ConfigParser()
+ config.add_section(CONF_SECTION)
+ config.set(CONF_SECTION, 'malwaredomains_repository', md_repo.strpath)
+ config.set(CONF_SECTION, 'malwaredomains_mirrors', 'good')
+ module = 'sitescripts.subscriptions.bin.updateMalwareDomainsList'
+ mocker.patch(module + '.get_config', lambda: config)
+ return config
+
+
+@pytest.fixture(autouse=True)
+def urlopen(mocker):
+ """Mock urlopen function"""
+ real_urlopen = urllib2.urlopen
+
+ def mock_urlopen(url):
+ if url.startswith('good'):
+ zf_data = io.BytesIO()
+ with zipfile.ZipFile(zf_data, 'w') as zf:
+ zf.writestr('justdomains', 'success\n')
+ return io.BytesIO(zf_data.getvalue())
+ if url.startswith('bad') or url.startswith('ugly'):
+ raise urllib2.URLError('Bad')
+ return real_urlopen(url)
+
+ mocker.patch('urllib2.urlopen', mock_urlopen)
+
+
+def test_good(md_repo):
+ main()
+ subprocess.check_call(['hg', 'up'], cwd=md_repo.strpath)
+ result = md_repo.join('malwaredomains_full.txt').read()
+ assert 'success' in result
+
+
+def test_bad(md_repo, config):
+ config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad')
+ try:
+ main()
+ except SystemExit as exc:
+ err_lines = str(exc).splitlines()
+ assert len(err_lines) == 3
+ assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2]
+
+
+def test_ugly(md_repo, config):
+ config.set(CONF_SECTION, 'malwaredomains_mirrors', 'bad\nugly')
+ try:
+ main()
+ except SystemExit as exc:
+ err_lines = str(exc).splitlines()
+ assert len(err_lines) == 4
+ assert 'Failed to fetch bad/files/justdomains.zip' in err_lines[2]
+ assert 'Failed to fetch ugly/files/justdomains.zip' in err_lines[3]

Powered by Google App Engine
This is Rietveld