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

Delta Between Two Patch Sets: tests/test_differ.py

Issue 29845767: Issue 6685 - Offer incremental filter list downloads (Closed) Base URL: https://hg.adblockplus.org/python-abp/
Left Patch Set: Address comments on PS7 Created Aug. 30, 2018, 4:23 p.m.
Right Patch Set: Address comments on PS8 Created Aug. 30, 2018, 5:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « abp/filters/renderer.py ('k') | tests/test_parser.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 16
17 from abp.filters.renderer import render_diff 17 from abp.filters.renderer import render_diff
18 18
19 BASE = '''[Adblock Plus 2.0] 19 BASE = '''[Adblock Plus 2.0]
20 ! Version: 111 20 ! Version: 111
21 ! Diff-URL: https://easylist-downloads.adblockplus.org/easylist/diffs/111.txt 21 ! diff-url: https://easylist-downloads.adblockplus.org/easylist/diffs/111.txt
22 ! Diff-Expires: 1 hours 22 ! diff-expires: 1 hours
23 ! Title: EasyList 23 ! Title: EasyList
24 ! Last modified: 26 Jul 2018 02:10 UTC 24 ! Last modified: 26 Jul 2018 02:10 UTC
25 ! Expires: 1 days (update frequency) 25 ! Expires: 1 days (update frequency)
26 ! Homepage: https://easylist.to/ 26 ! Homepage: https://easylist.to/
27 ! Licence: https://easylist.to/pages/licence.html 27 ! Licence: https://easylist.to/pages/licence.html
28 ! 28 !
29 ! Please report any unblocked adverts or problems 29 ! Please report any unblocked adverts or problems
30 ! in the forums (https://forums.lanik.us/) 30 ! in the forums (https://forums.lanik.us/)
31 ! or via e-mail (easylist.subscription@gmail.com). 31 ! or via e-mail (easylist.subscription@gmail.com).
32 ! 32 !
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ! Version: 123 66 ! Version: 123
67 - &ad.vid=$~xmlhttprequest 67 - &ad.vid=$~xmlhttprequest
68 + &ad_channel= 68 + &ad_channel=
69 ''' 69 '''
70 70
71 71
72 def test_differ(): 72 def test_differ():
73 exp = set(EXPECTED.splitlines()) 73 exp = set(EXPECTED.splitlines())
74 gen = set(render_diff(BASE.splitlines(), LATEST.splitlines())) 74 gen = set(render_diff(BASE.splitlines(), LATEST.splitlines()))
75 assert(gen == exp) 75 assert(gen == exp)
LEFTRIGHT

Powered by Google App Engine
This is Rietveld