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}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD@#!T6hNL(lSAxs!4w?P=+u#424u8Qgn^OHSJ3wv&Ie--RqlW=VKM2Fj1ko_R zql<&|g5m(A28Ka#L`wXD(f}we!1TjtqSFt^00ssIP@074#YThDZw`+13pIiPn>*0W i0;z$i$4Zl!e?RauFg##~;08vlCZY&})WFn(^a21O1~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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEluIOS#XS#`n~7&sq$x;TbZ+rQG|HtjG-rK8_KT3h2}%zXw(jZpx^@av(}iC_B>^pt zf{PuN2CZpZ=#;iVa5wjEB4wh0(QyL;C$&~Lry*Ky&4%H` zmwmta*Y5Y9dG|lp%ug>>iFjjnT49064#pjF5=;>dCI@upKVzEHz#+rl$JpMOmA$k= zYvTFk-V6zIc`A$w#1nc$RX0fAP?C0eHJNS0ZJnJ5WD=|b<}45oW8cHPW@A`aZ|xz5 zve`=+D!3}PG<&N@#T>9oSh_VR=Y=Tqja)Hi1L+99lnd667{r*f*G^sZU)s3gZki-x z4vW_d=^$>Kl(i!KZq*AHF#hpLh?i&T|D*H!NxF9r`;A<&#e3eRUD&=mhahK|9Dd2`NJvxm0Y!D zb`19>w+r5nY1zGP*>dmIjhwcUj^d5C|1aHsujbkl^%FCCi`WaUhq*uE zw11Un`9*}~`d6`vy-OS3X!>jKH+2@;xjDYW_P;Zx2yS0+S$fxg1&IZ9 zS)BKT*>~BWz1j3XCU!~xM5dfAw{;dqPiu)o$j$uD9$#Cw6Rl@IMKmt&k>GY%uyf+Iy}K9n|C{_w zc}aTl!=LU2^?_G2xhG`Y+}8FiH+zfCts=?ApUg70M}{%^XPpb@aVvVh$KzMa$~p0N zve%be8$1y;DmZLca_q^9lFGg}ixW>av&=oK!oRok$wG6*%G)1gRvZ-H`C9wr>1$pe zSL(4%c>U9At?F96n=S`8&o;RG#g^fZ__>0rXA&yw+viAjpQw89aYZTH5w=;|_jPT4 zb)H2gN#j@iXWc(Z%t5oQrv>f$VKo23MTYZC-dp$mY-%eXxg){%JVa?a$946*Utj!XeK6_|MH5FbkxS;twtx-&Ht|9Belw*HgMS0Kr zIex0%DwVi$Yf#L!JcgOatX57vd9wD6sL{K+71_t0eJ)D77E$y3mBDnsBNOJff1b=A z`nj^UjkP#aa;9+lM3aPq?=A<9zrXZj*0ZZo>@nGEMO1AM{5iOCJ9B^b#T31{9Zw$~ zJvDFP_2dmA4_2)_Q2t6I_xQiYCxQNFmztU99{=B&>~7h(jC)DX4$;_2fgkTYdF}OK z9#`e0X*$v?s?NT%E3Fitu_m+M|FlZ^yY5xTYoEW`vEyay3sH7vi?S)jW$)(xICtx+ zZT`7#j?9@+dlQO|=LQ7tn{S$F_lu`n>qoKw{qFVuc04P1Yn}bv-v3VT`!k$ZZIoaC ztBksOpLN0H%HJ!#iz=GVb$l=DHht2qudKUb=gj^8cgBJCr+=B*f_GH$H=SHlvHq9l zVa{!Fmlo}cxDfSxdGGus9C8nmetz1~$o^rj<-w!8-l0Lc#+l{!mWP(EbXburyqD4I zbjY1=Dt)p~3)l1MzrC|$m&lo=!dqAEbyT>r?p0d9ztYcNflK7ch%eX`Syn7dzX(ZtLmD1F4!sfe&yn><2|m?Aw65WKcPs19^VgnQJf;oIeal*;AH1Ia{Alpp$Ol^D%`tLqm5oonKl=IVbKc$q z#ToidCwmsg2ev1vSwG~T^Zm)|C3WA~J>{xhi^UYV^acDR+ebw*~!bS-DClkmu&}#Kr(|(<l{_vB23Pte5)I~x6^ z3?xpUNj-I^^LFd!^|!aIS||3z(x&>#65rRVQ6blMB^U*7c(ZrIBhTUor?&)bDA}C# z^6ia%aoXYu+rzrvPPvh%D>ZBTzFU6b<(1igyI=nQ{noJ3DQMx;?6{v1SHCj*#$W!U zepdI)U0KbIx=|)9b9Fni#a1xCi1#^nh4rGg*q4+$#?6e`t8QJ+QO%6m-LPP@>uSbr zG3Qt&K6a3m$|!uUE6$?-00&lji2FR!nY))jqi_(k63*j{7L{|`eZEQvV4yymq< z`kkHDF$(EzhQ0e{_Fy=?lX6aT;d`tZTiD&^1nEK__h zx%B9~vx!;j(y>O>q*_{>Z++b<4ypKhw(?xx6k*we4C`KTOq<6l{1uD+m?J2TyD8gTXNB%2~$)A_guM?>Y;V_oAIZ*ovWg2m#6myz7;Lu z(>zeFBsFQ$^h1uj&l>SZ$on(1-1W0*|Mtjo%l79BUcKD8Yx16X9{INZxszh13U3MP z$`_Qfc_&&Z|4XN*@SV=SUypz2&*^jt-PzN+f=A)>;;7dxGak3!aJc+zdWdD$v8{qj zZ|qLxdG*t~Uo|*hW?J22^Bw$u)*cU<9?`zkTJqs5nd$EnT2_B=?(}P$;hE8Av9zD@ z`-zKoT5jL|%ll^ToL#f{;(;2={qJ-OPnn jzkF9>iGRJ_|M=ut;