tests/test_differ.py - Issue 29845767: Issue 6685 - Offer incremental filter list downloads

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: Store metadata in a dict Created Aug. 29, 2018, 10:51 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

LEFT	RIGHT
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
Sebastian Noack 2018/08/29 22:58:10 Perhaps turn one of the keys here to lowercase in Perhaps turn one of the keys here to lowercase in order to test that they are compared case-insensitively? Sebastian Noack 2018/08/29 23:03:24 Ideally, there should be one key with changed and Show quoted text On 2018/08/29 22:58:10, Sebastian Noack wrote: > Perhaps turn one of the keys here to lowercase in order to test that they are > compared case-insensitively? Ideally, there should be one key with changed and one key with unchanged value using inconsistent spelling (capitalized vs all lowercase). Sebastian Noack 2018/08/30 16:38:33 It seems you missed this comment. Show quoted text On 2018/08/29 23:03:24, Sebastian Noack wrote: > On 2018/08/29 22:58:10, Sebastian Noack wrote: > > Perhaps turn one of the keys here to lowercase in order to test that they are > > compared case-insensitively? > > Ideally, there should be one key with changed and one key with unchanged value > using inconsistent spelling (capitalized vs all lowercase). It seems you missed this comment. rhowell 2018/08/30 17:38:20 Oops! Done. Show quoted text On 2018/08/30 16:38:33, Sebastian Noack wrote: > On 2018/08/29 23:03:24, Sebastian Noack wrote: > > On 2018/08/29 22:58:10, Sebastian Noack wrote: > > > Perhaps turn one of the keys here to lowercase in order to test that they > are > > > compared case-insensitively? > > > > Ideally, there should be one key with changed and one key with unchanged value > > using inconsistent spelling (capitalized vs all lowercase). > > It seems you missed this comment. Oops! Done.
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 Loading...
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)

LEFT	RIGHT