Left: | ||
Right: |
OLD | NEW |
---|---|
1 # This file is part of Adblock Plus <https://adblockplus.org/>, | 1 # This file is part of Adblock Plus <https://adblockplus.org/>, |
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 12 matching lines...) Expand all Loading... | |
23 | 23 |
24 import os | 24 import os |
25 import pytest | 25 import pytest |
26 import subprocess | 26 import subprocess |
27 import threading | 27 import threading |
28 | 28 |
29 try: | 29 try: |
30 import SimpleHTTPServer | 30 import SimpleHTTPServer |
31 import SocketServer | 31 import SocketServer |
32 except ImportError: # The modules were renamed/moved in Python 3. | 32 except ImportError: # The modules were renamed/moved in Python 3. |
33 import http.server as SimpleHTTPServer | 33 from http import server |
34 import socketserver as SocketServer | 34 import socketserver |
35 SimpleHTTPServer, SocketServer = server, socketserver | |
rhowell
2019/01/29 20:28:39
Just curious, why not do it in 2 lines instead of
Vasily Kuznetsov
2019/01/30 10:42:48
I was trying to avoid disabling the linter. But al
| |
35 | 36 |
36 | 37 |
37 @pytest.fixture | 38 @pytest.fixture |
38 def rootdir(tmpdir): | 39 def rootdir(tmpdir): |
39 """Directory with prepared list fragments.""" | 40 """Directory with prepared list fragments.""" |
40 rootdir = tmpdir.join('root') | 41 rootdir = tmpdir.join('root') |
41 rootdir.mkdir() | 42 rootdir.mkdir() |
42 # Simple file with just `Ok` and a non-ascii unicode character in it. | 43 # Simple file with just `Ok` and a non-ascii unicode character in it. |
43 rootdir.join('simple.txt').write('[Adblock]\nOk') | 44 rootdir.join('simple.txt').write('[Adblock]\nOk') |
44 # Fragment with a non-ascii character. | 45 # Fragment with a non-ascii character. |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 | 203 |
203 @pytest.mark.slowtest | 204 @pytest.mark.slowtest |
204 def test_failed_web_include(rootdir, dstfile, webserver_port): | 205 def test_failed_web_include(rootdir, dstfile, webserver_port): |
205 url = 'http://localhost:{}/missing.txt'.format(webserver_port) | 206 url = 'http://localhost:{}/missing.txt'.format(webserver_port) |
206 webinc = rootdir.join('webinc.txt') | 207 webinc = rootdir.join('webinc.txt') |
207 webinc.write('[Adblock]\n%include {}%'.format(url)) | 208 webinc.write('[Adblock]\n%include {}%'.format(url)) |
208 code, err, _ = run_script(str(webinc), str(dstfile)) | 209 code, err, _ = run_script(str(webinc), str(dstfile)) |
209 assert code == 1 | 210 assert code == 1 |
210 assert err.startswith( | 211 assert err.startswith( |
211 "HTTP 404 Not found: '{0}' when including '{0}'".format(url)) | 212 "HTTP 404 Not found: '{0}' when including '{0}'".format(url)) |
OLD | NEW |