Fixes 4784 - Improve error reporting in updateMalwareDomainsList and add tests

sitescripts/subscriptions/test/test_updateMalwareDomainsList.py

 # 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
@@ skipping 42 matching lines @@
 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')
+        if url.startswith('bad'):
+            raise urllib2.HTTPError('Bad', '42', 'No good', [], None)
+        if url.startswith('ugly'):
+            raise urllib2.URLError('Ugly')
         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]
+        assert '42: No good' 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]
+        assert 'Ugly' in err_lines[3]