From bb5f20e3decf7dd70c4f155b086426c992a65180 Mon Sep 17 00:00:00 2001 From: bendikro Date: Tue, 14 Jul 2015 15:51:54 +0200 Subject: [PATCH] [Tests] Fixes in test_tracker_icons.py * Removed publicbt.org test as server is down * Replaced ubuntu.ico with ubuntu.png to make the test pass --- deluge/tests/test_tracker_icons.py | 12 ++++-------- deluge/tests/ubuntu.ico | Bin 1150 -> 0 bytes deluge/tests/ubuntu.png | Bin 0 -> 2646 bytes 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 deluge/tests/ubuntu.ico create mode 100644 deluge/tests/ubuntu.png diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py index f6d4b880f..b6aa0b717 100644 --- a/deluge/tests/test_tracker_icons.py +++ b/deluge/tests/test_tracker_icons.py @@ -1,5 +1,7 @@ import os +import pytest + import deluge.component as component import deluge.ui.tracker_icons from deluge.ui.tracker_icons import TrackerIcon, TrackerIcons @@ -13,6 +15,7 @@ deluge.ui.tracker_icons.PIL_INSTALLED = False common.disable_new_release_check() +@pytest.mark.internet class TrackerIconsTestCase(BaseTestCase): def set_up(self): @@ -48,7 +51,7 @@ class TrackerIconsTestCase(BaseTestCase): def test_get_ubuntu_ico(self): # ubuntu.com has inline css which causes HTMLParser issues - icon = TrackerIcon(os.path.join(dirname, "ubuntu.ico")) + icon = TrackerIcon(os.path.join(dirname, "ubuntu.png")) d = self.icons.fetch("www.ubuntu.com") d.addCallback(self.assertNotIdentical, None) d.addCallback(self.assertEquals, icon) @@ -62,13 +65,6 @@ class TrackerIconsTestCase(BaseTestCase): d.addCallback(self.assertEquals, icon) return d - def test_get_publicbt_ico(self): - icon = TrackerIcon(os.path.join(dirname, "publicbt.ico")) - d = self.icons.fetch("publicbt.org") - d.addCallback(self.assertNotIdentical, None) - d.addCallback(self.assertEquals, icon) - return d - def test_get_empty_string_tracker(self): d = self.icons.fetch("") d.addCallback(self.assertIdentical, None) diff --git a/deluge/tests/ubuntu.ico b/deluge/tests/ubuntu.ico deleted file mode 100644 index 057d443b8d4e469cbf9f228b30594e217fca5c1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#F2mb$Ol}Y`-RoMORe`E|2V*twG zGej!!|6XK0*w`R7*vt^|e*FQPdYIU+-~aw+_q+nT38WU;3~cs>*F68f|LnK_`+(Rc z?eTvQ`2FWU+)r?K0R05B14N5@-u-{!){p-WU;GB^0TG|R{{3&8@fa+JtQHg==wSuZ zgse^{`XNjhZa+vKU2jC~bFeyHpn7EeAU4blkQ#KkfbwTxeI1M5foXJk82|IPzyCKK z{z7&AF!RZAKYAFz0t#j(h=%zcB!?^xOOwcAq{bg89Z{5ipb3$f^qYet{ld~RHg_QV q4aA10TbL$v8cUi4>4Sw8y7CYF3=9w0A-I7NT^5rMQUg;D(hC3~1~0?_ diff --git a/deluge/tests/ubuntu.png b/deluge/tests/ubuntu.png new file mode 100644 index 0000000000000000000000000000000000000000..1f3bcccb0418452ea49c7645a436d6aa6c877725 GIT binary patch literal 2646 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 Ef`?WdbpQYW literal 0 HcmV?d00001