From 607be461e013438271bdf886a1c48cc961a34cfc Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Wed, 1 May 2013 04:13:05 +0100
Subject: [PATCH] Fix and update tests

---
 deluge/tests/common.py             |   2 +-
 deluge/tests/google.ico            | Bin 5430 -> 0 bytes
 deluge/tests/google.png            | Bin 0 -> 640 bytes
 deluge/tests/test_common.py        |   6 ++++++
 deluge/tests/test_tracker_icons.py |   4 ++--
 deluge/transfer.py                 |   3 ++-
 6 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 deluge/tests/google.ico
 create mode 100644 deluge/tests/google.png

diff --git a/deluge/tests/common.py b/deluge/tests/common.py
index 54cab32a4..bbe09dbf2 100644
--- a/deluge/tests/common.py
+++ b/deluge/tests/common.py
@@ -43,7 +43,7 @@ deluge.main.start_daemon()
     core = Popen([sys.executable], cwd=CWD, stdin=fp, stdout=PIPE, stderr=PIPE)
     while True:
         line = core.stderr.readline()
-        if "Factory starting on 58846" in line:
+        if "starting on 58846" in line:
             time.sleep(0.3) # Slight pause just incase
             break
         elif "Couldn't listen on localhost:58846" in line:
diff --git a/deluge/tests/google.ico b/deluge/tests/google.ico
deleted file mode 100644
index f594697d2f9edeb4e5b921d406a0b4b60512bfae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5430
zcmZQzU}Ruo5D);-3Je)63=C=v3=9ei5dI1Q28KQs1_liV1_l9;I0HnS0R&hW7=*YX
z7{mqPFRe~qUs|1>e`$64Pa=K-)%%P@eaQA;*!#8D@Bgn8tN;Id|NQ^or`P}gzOwiK
z@AF&#e_xn~tPdyq_l-mU|Gs(n|Lc@UgqjYw|9@^D|NngvVKe@|d;0(9?r8|U&~W*=
zYs&xMmv>=^qx=2mzS;l(+&lCCONTpL?bk`+U^o3fzXdLat`C|2ePz}EUnf@m|G8({
z|DT5z{Qvjm-T%LDAOHV4DU2xnaI@Oo{{Q>-@&BJkm;Zn54<t$Nw|SZWf9{<0|NsAg
z|9@;~B}wnk9TWfm|NZm-_Z5}@zxMk7|9y7T|8MiNh&JQj*AM@HpW6&q|9wf}|G%#v
z!1-|hLE{FU|L@x;6gU6a-1-0i?;k|#|8-*J|DSuNL)5pq{Qvvp>i^%@_CxqM>_l-x
zo6CPtdI6=QKMybb|Nrmr|6ixq|Np+c9Ge-G<R6e;&o8Y`AR3$5_{2bZJV9juB^XrB
zC@?TEI3SlZ0+2EWRMx=E{?h8i@TJvB{Y$IU+Apn6pHRY!m@p+>4ag3VT_8I_c58fT
zb$U++d(p!jWGBdOkXz8@=*0)w{c!;N4)fn<V(tFg?fw79wmxuq{qNIjaK8Qj=QpGb
ze17Zyud^Hfe_vei|4XYg%xtRB-<K5q|M&ULe;5FlLzi~`|G9T2*iAooPyPS<($4??
zeth}==kewL-)1CG&F*j0WB>pE^&MjM-``+6zjU}^H6K)_{&{fz|G%&A|9_jAh*b@-
z;SEy<s+%B||NsAEOE*C?zfK7H|Nqag|9>7|A*dE+2R<59#)9kz)pf+i?cZlNKwAEP
zo0UYd8-8Cu2sR7UcEIOOWVwGIo`d!L*wjI>{ohyDg3bE>_s{>YlOqV4_hWMxME(E&
zD0LmO`$%Q~I<o<6=HI8+@U}I6Y;5}v%9CKle}4b}Ix&=>dx>=m$ZSx!{`>j$Kgc~l
z*3^U3I4He+?GFOyf3Uq!0+ct2HJfO4ZO;F}?VsJ#z-^a5w~m3^Ur;Nd)W82f56-8W
zzX`eR&z%!cd;kCc_w(ETAM2awW;duU4YT~;m$y{OZ-o4dEdO;%6wLbnzm6@Zi@(1w
z%>DoS;*S4+U*7%y_r+~+8xG_MP@e=>xs2>)O4y(_Kgcc+{`>0Q|L@Dn{(tQY`2THg
zI=Eg0rG>BEJ~RmjP~QV&F9?I`UyOc3yBj1-o?QL^rPGt@ZuoQm9LQ=g{;{zgtNFhU
zF9OTcBLBha;D0~9qV(aA<MZdfSz!A?eKKTmYOrDUgTeuqd7yF;<N#1PfJ+Uz;;?%7
z_mw?Z!yaTVsE!2N|LHYOH6V55U{Ko+WHv7Ue_vb(k_KZ?TaX+(@ak!I{SWT5{r-Vj
z2X=Y=2jxeQ<^R5a`u}xuIMw|Ra@*G)U+}mGsL%U-SqZog{e4mXe^`45RQH0~9ABqK
z|NqkNN)tDL-0^Ke4!HjN`|=LB%?t83ItIHDd%qUlT?5_!0QG^;-9#@w$Zk+S6x0`_
pmz^+sKz4%c2K9keq5W@q#0AI>kiS88GBkjOAz_07bf!Ue0{}sbW1|27

diff --git a/deluge/tests/google.png b/deluge/tests/google.png
new file mode 100644
index 0000000000000000000000000000000000000000..553ad65ba467b953d78e440286c5c150b83c98bd
GIT binary patch
literal 640
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to+&x_!Ln`LvPCoA)5-4)q
z{`o%nb0+_^x|b9z+^XThA}lE0=sa<@2FId|a7O_Nr+P>3>ABG^xh-aHp4{SsE!{#q
z%Eb#8&aTUp^j*=rZ)W-Z+U-ZHjr*=e#_VYS{P$k*{`<u$_Cb4i?l4C&GA=1<5sYx)
zoFOrVDLm2hl6`~qBzet$Oi`DXa0o<exKF#L)*2+x5-`7UQ`=YFZjT^tkvn%2k`ER?
zsOfL-TkyTZ`+i`1XXM!@dlK_5D>N;cAr{Iw*=UN>j?!bxbLT($IOW;9%|iF<jz4+T
zV(u-t&RLaZ!zwPeEsf7)=Dht95z%+@*9Or;lQYl06xLho+hnGxpc;6kWl54H*RI>L
zO-3%qKB;f0(LBPEsFac$vR<q}G-sMlznU}K?wEC7s%5go{K|IRsh1SWC{S7Xx4j|c
zZ;yVDZ+4rz_nUlyV|mYi>`1Ek=y-XCXV$;lj&IGqZW(Qr`1mKb<^92(dDHuv`HmJD
z30uGVtb9~<j#bk^z3JbWyQZ3YJG1G1t(;=Q)6ceM&Cwt065g)kn{ps5W2fDN;)TZ_
zzl=V6r26dPlM}M}nWh}*Wt?wt>)|1@#?Hik{g^kUm8SBB->*Kfybz?Xqa%GR-K6*C
z+v(YyIx63$D9`vSQoQy4<12>Zxsz%w>TWFD>}zPZcyi%gzUYewx)dfh9$Qmj{Qlz2
zXCHPZ{M;$1%yiki?Rt0H8vmu;DSxu3uXGB!Hf^t^;&e|R{hTN-#V4;;nT1XFWOP1I
yejuv5RCdLA4o8mFucuw*?f$@jW7&*_`+4tt+d50A_cj9q1B0ilpUXO@geCy{2qVh?

literal 0
HcmV?d00001

diff --git a/deluge/tests/test_common.py b/deluge/tests/test_common.py
index a7425db36..3fbc658f0 100644
--- a/deluge/tests/test_common.py
+++ b/deluge/tests/test_common.py
@@ -56,3 +56,9 @@ class CommonTestCase(unittest.TestCase):
         self.failUnless(VersionSplit("0.14.9") == VersionSplit("0.14.9"))
         self.failUnless(VersionSplit("0.14.9") > VersionSplit("0.14.5"))
         self.failUnless(VersionSplit("0.14.10") >= VersionSplit("0.14.9"))
+        self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.3.900.dev123"))
+        self.failUnless(VersionSplit("1.3.2rc2.dev1") < VersionSplit("1.3.2-rc2"))
+        self.failUnless(VersionSplit("1.3.900.dev888") > VersionSplit("1.3.900.dev123"))
+        self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.4.0.dev123"))
+        self.failUnless(VersionSplit("1.4.0.dev1") < VersionSplit("1.4.0"))
+        self.failUnless(VersionSplit("1.4.0a1") < VersionSplit("1.4.0"))
diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py
index 4f8782d4f..c671b4f3e 100644
--- a/deluge/tests/test_tracker_icons.py
+++ b/deluge/tests/test_tracker_icons.py
@@ -24,7 +24,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.ico"))
+        icon = TrackerIcon(os.path.join(dirname, "google.png"))
         d = icons.get("www.google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
@@ -32,7 +32,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.ico"))
+        icon = TrackerIcon(os.path.join(dirname, "google.png"))
         d = icons.get("google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
diff --git a/deluge/transfer.py b/deluge/transfer.py
index a09ad98a5..f27a65460 100644
--- a/deluge/transfer.py
+++ b/deluge/transfer.py
@@ -41,10 +41,11 @@ except ImportError:
 
 import zlib
 import struct
+import logging
 
 from twisted.internet.protocol import Protocol
 
-from deluge.log import LOG as log
+log = logging.getLogger(__name__)
 
 MESSAGE_HEADER_SIZE = 5