From a60dc95fedba930fef90797fcf11bc1707ff64b5 Mon Sep 17 00:00:00 2001
From: bendikro <bendikro@gmail.com>
Date: Wed, 1 May 2013 22:38:48 +0200
Subject: [PATCH] Fixed tests: sessionproxy/torrent/tracker_icon

* Fixed sessionproxy tests
* Fixed test_torrent messing up component for other tests
* Updated tracker_icon test to use unresized google icon
---
 deluge/tests/google.ico            | Bin 0 -> 5430 bytes
 deluge/tests/google.png            | Bin 640 -> 0 bytes
 deluge/tests/test_sessionproxy.py  |   8 ++++++++
 deluge/tests/test_torrent.py       |   6 ++++--
 deluge/tests/test_tracker_icons.py |   7 +++++--
 deluge/ui/sessionproxy.py          |   1 +
 6 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 deluge/tests/google.ico
 delete mode 100644 deluge/tests/google.png

diff --git a/deluge/tests/google.ico b/deluge/tests/google.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f594697d2f9edeb4e5b921d406a0b4b60512bfae
GIT binary patch
literal 5430
zcmc&&=}#3`6d#*@^NZ<Uz?Z6jM&m-`(nS-C)tIz?sT!BsG;L~PG$sN{#eyh8<A%n)
zQN%XxMopB&g(@gSsMRVUbzz%3`^?XC?l{lq;|*`#W8mH7&T`&4=XdUzd(ZL|Wt{SX
zGGT&3_X1_fhl(;$QIvuL|NSu0%ZWCbX!J-NKAmogLiCTu`%}KtMcp`MCe3b|$Z|e=
zE8CT&Tr$oOT(RYISdGWv^>)MUY=zx&5q8s`(D$uOmJ5Bh+pfZW`2?cs>vue*g>c$$
zK(EWJ!+qTe^Zbr?vTyxjo~wf0d~OImb?xS*-{CyE1-10k1h1$pk~Y~*rxUbPx#V~K
z$Qts&QJ5EYz`VK_p86W@tEUi^UqzBn=qf3Mr}e}6uNh+NoUCNE-AiGftpwn~IJq$^
zS@TQ<V4Khn{{pe)3)r_$LEEz|vJOx5!M@Xw;MWhVhWp}i;ytmxkUi^Z1Mk^vG;AV!
zjL7m<;}P<Gwa;HX4eqo1upeBGEU%Ib?-$-j&Xd2%g)Xd{C!intIh~G?oFA5*K{FQ}
zQZ|SKx!yU>6wv&HCdVT=DDb3-GaPFs(fotv0L^s1h?B+`jK!FYJ(*@N%{Vcl=weL9
zW?Q20j|LB8_vaCRFe<hvn+4;qav86^ffw@J!m<4r*!>XJ?Rx0@zb79}jonZBfgj)v
zzNDDv4;hE<orQU^M%rYa-wvDJJwt`_v>DpYZ(_4St6l_Hx)1Ey5>utTmCkP*Q=P|6
z@I)`Pns3wcq>~$t#<?jN#_6(*I>m2u0mmXgv}EKR4mbFXV=NEOby2^q+tnszwA#fZ
zw!v<_B6V@?5ZILI?)7y`8RJxGWSKCX`mwcA7hDHo+x(3BjE2oVKV7rU&tW!Lw@yl(
zZs&txYYn5mn7+O3<I`PK%*$wR7-lM+b+cbRQ-JL;j<1t@ocEj9I#-_m#KP%;&t|HQ
z5x*Btg{*%le{=2PJiIRJuVh@Vi_9x~;>Qlj5l%;A0^Tz<7$-K288+9_!SK{qh~vCv
z^NmE+f&d=Y^+RK_ZhhYh*muvs?fD1p^LAOou@T&pgvI4-)-)V1*Zje7|9=Gi;7<_c
zUqajUoy?287ev|YQSk%!9>L)JJEU)*o<jPB;<dVIM(j2?|K17UVbqtT)o)#^lRTqw
z{(>Cr8RESjF8O<zmue+G_hiZRIGzK1_CuJyAWm}}2;<3>9^_%W<wB@#&XGKLf8>f2
zCdaiOkFfRY`&Y}~`NFken4X;JCDZ+$jrzqQ{r2XW;Pc4C(+4O|7sZcH@n8J<nf%{_
zdtUwEkFtl>>sBGCcR2TQ%^|iggi7}2yw;Fh6X?_SE|>Yw?dgy;uUvS_McSCYuT8Zp
m-~C6v`!DW8^VNR_J@Ch5!&vo#{Jj~AF_rcF_duQoW4{4Gi({hz

literal 0
HcmV?d00001

diff --git a/deluge/tests/google.png b/deluge/tests/google.png
deleted file mode 100644
index 553ad65ba467b953d78e440286c5c150b83c98bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006<Nkl<Zc${sM
z&r4KM6vsd3z8}ss{wj;4aG|v*NCXoR7lA{On<xmPXjefH7(#zR3zuzML~VpNMo9}7
z5rm5p3?p-)p__hb8BM5-zL|I5eYeGXGmh3-T)2nx{oZrG-*Y5CQoIb@16lzAq;iB2
zSU?Gw7?c86VM)?IfIE^ODgFXl(xeCwTPR1C)+U8g5QI>lfwG46EsID}3l!YlU}M2^
z;CzpVj-dC5OW#q4iCN9$ykTzBAcCZr7F7Y0GL%BNb;hS{pW^Y9=I*l+-+ssB>V!8-
z5w1fe1hA?K2DE|Z9Gva+SXhq9`mhzklWEQA6E3Yyf;K52B~jFbq+&S=y4xLsGDODm
zC$M}e!~|g?WNlQh7H}18mMo7ZLk7ECuJn5xY8Fm*xZHmk5@>KFsr`q5RQ-%Ej7@8X
zM@#H)5XNrj__$(t@j=s=NoxMvLG3q6+A_5m@%&wc@4>llmyUxD#d0zeJL>Zz#T}eF
zg267A_5+HQHA_PVF7<hoGz^ahtgOZOu3+u14wS%FXt_S%bD_uM>08ajd(FeikZTVD
zl)#MvpD^0t!Zv}4VUI6d>~(oHA2IjU;5pDzFDxt@#%DB*+3lBW2`nV`lp~n^6mzxT
z<J2)1ZIXRBe%PV2O));BlX2Y+ThYLZAd!K_tZ*~$(b?wkxnTLZ5hDWAONQ5rhOAGe
zi)8$3m#IQh)|S0FA(u%^FKk*$A>`_+HddEO0Ykudz*>uS9jMO;K?tksmemc5@DJFg
an4!N7-1fDa5{=sc0000<MNUMnLSTaX2qVh?

diff --git a/deluge/tests/test_sessionproxy.py b/deluge/tests/test_sessionproxy.py
index d97a4d622..bd1c9c1a1 100644
--- a/deluge/tests/test_sessionproxy.py
+++ b/deluge/tests/test_sessionproxy.py
@@ -87,6 +87,14 @@ class SessionProxyTestCase(unittest.TestCase):
         self.sp = deluge.ui.sessionproxy.SessionProxy()
         client.core.reset()
         d = self.sp.start()
+
+        def do_get_torrents_status(torrent_ids):
+            inital_keys = [
+                'queue', 'state', 'name', 'total_wanted', 'progress', 'state',
+                'download_payload_rate', 'upload_payload_rate', 'eta', 'owner'
+            ]
+            self.sp.get_torrents_status({'id': torrent_ids}, inital_keys)
+        d.addCallback(do_get_torrents_status)
         return d
 
     def tearDown(self):
diff --git a/deluge/tests/test_torrent.py b/deluge/tests/test_torrent.py
index f55b4d4e2..381c2bb9a 100644
--- a/deluge/tests/test_torrent.py
+++ b/deluge/tests/test_torrent.py
@@ -7,8 +7,6 @@ import common
 from deluge.core.rpcserver import RPCServer
 from deluge.core.core import Core
 
-deluge.core.torrent.component = test_torrent
-
 from deluge._libtorrent import lt
 
 import deluge.component as component
@@ -37,6 +35,9 @@ class TorrentTestCase(unittest.TestCase):
         core_config.save()
 
     def setUp(self):
+        # Save component and set back on teardown
+        self.original_component = deluge.core.torrent.component
+        deluge.core.torrent.component = test_torrent
         self.setup_config()
         global rpcserver
         global core
@@ -50,6 +51,7 @@ class TorrentTestCase(unittest.TestCase):
         if self.torrent:
             self.torrent.prev_status_cleanup_loop.stop()
 
+        deluge.core.torrent.component = self.original_component
         def on_shutdown(result):
             component._ComponentRegistry.components = {}
         return component.shutdown().addCallback(on_shutdown)
diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py
index c671b4f3e..10aa21a8f 100644
--- a/deluge/tests/test_tracker_icons.py
+++ b/deluge/tests/test_tracker_icons.py
@@ -11,6 +11,9 @@ icons = TrackerIcons()
 
 dirname = os.path.dirname(__file__)
 
+import deluge.ui.tracker_icons
+deluge.ui.tracker_icons.PIL_INSTALLED = False
+
 class TrackerIconsTestCase(unittest.TestCase):
 
     def test_get_deluge_png(self):
@@ -24,7 +27,7 @@ class TrackerIconsTestCase(unittest.TestCase):
     def test_get_google_ico(self):
         # Google doesn't have any icon links
         # So instead we'll grab its favicon.ico
-        icon = TrackerIcon(os.path.join(dirname, "google.png"))
+        icon = TrackerIcon(os.path.join(dirname, "google.ico"))
         d = icons.get("www.google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
@@ -32,7 +35,7 @@ class TrackerIconsTestCase(unittest.TestCase):
 
     def test_get_google_ico_with_redirect(self):
         # google.com redirects to www.google.com
-        icon = TrackerIcon(os.path.join(dirname, "google.png"))
+        icon = TrackerIcon(os.path.join(dirname, "google.ico"))
         d = icons.get("google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py
index 0b5234704..652ebbf87 100644
--- a/deluge/ui/sessionproxy.py
+++ b/deluge/ui/sessionproxy.py
@@ -76,6 +76,7 @@ class SessionProxy(component.Component):
                 # so that upcoming queries or status updates don't throw errors.
                 self.torrents.setdefault(torrent_id, [time.time(), {}])
                 self.cache_times.setdefault(torrent_id, {})
+            return torrent_ids
         return client.core.get_session_state().addCallback(on_get_session_state)
 
     def stop(self):