From da1c07ff99bc6f7ac6e3901cb8892e930341be85 Mon Sep 17 00:00:00 2001
From: bendikro <bendikro@gmail.com>
Date: Wed, 2 Sep 2015 17:07:37 +0200
Subject: [PATCH] [Tests] Fixes to make tests pass

* Fix GTKUI column types mismatch (broken by 239e679)
* Updated deluge/tests/google.ico
* Remove empty line in torrentmanager.py
---
 deluge/core/torrentmanager.py    |   1 -
 deluge/tests/google.ico          | Bin 5430 -> 5430 bytes
 deluge/tests/test_torrentview.py |  26 ++++++++++++++++++--------
 tox.ini                          |   2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 97afd9fca..28d1e17ce 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -335,7 +335,6 @@ class TorrentManager(component.Component):
                 log.error("Unable to add magnet, invalid magnet info: %s", magnet)
                 return
 
-
         # Check for existing torrent in session.
         if torrent_id in self.get_torrent_list():
             log.warning("Unable to add torrent (%s), already in session", torrent_id)
diff --git a/deluge/tests/google.ico b/deluge/tests/google.ico
index f594697d2f9edeb4e5b921d406a0b4b60512bfae..82339b3b1dbbcf4550b737faf99c7774196fb8cb 100644
GIT binary patch
literal 5430
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

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

diff --git a/deluge/tests/test_torrentview.py b/deluge/tests/test_torrentview.py
index 52293fd02..8e5730c5a 100644
--- a/deluge/tests/test_torrentview.py
+++ b/deluge/tests/test_torrentview.py
@@ -29,17 +29,27 @@ deluge.common.setup_translations()
 @pytest.mark.gtkui
 class TorrentviewTestCase(BaseTestCase):
 
-    default_column_index = ['filter', 'torrent_id', 'dirty', '#', u'Name', u'Size',
-                            u'Downloaded', u'Uploaded', u'Remaining', u'Progress',
-                            u'Seeds', u'Peers', u'Seeds:Peers', u'Down Speed',
+    default_column_index = ['filter', 'torrent_id', 'dirty', '#',
+                            u'Name',
+                            u'Size', u'Downloaded', u'Uploaded', u'Remaining',
+                            u'Progress',
+                            u'Seeds', u'Peers',
+                            u'Seeds:Peers', u'Down Speed',
                             u'Up Speed', u'Down Limit', u'Up Limit', u'ETA', u'Ratio',
                             u'Avail', u'Added', u'Completed', u'Complete Seen',
                             u'Tracker', u'Download Folder', u'Owner', u'Shared']
-    default_liststore_columns = [bool, str, bool, int, str, str, TYPE_UINT64,
-                                 TYPE_UINT64, TYPE_UINT64, TYPE_UINT64,
-                                 float, str, int, int, int, int, float, float, float,
-                                 float, float, int, float, float, float, float,
-                                 float, str, str, str, str, bool]
+    default_liststore_columns = [bool, str, bool, int,
+                                 str, str,  # Name
+                                 TYPE_UINT64, TYPE_UINT64, TYPE_UINT64, TYPE_UINT64,
+                                 float, str,  # Progress
+                                 int, int, int, int,  # Seeds, Peers
+                                 float, float, float, float, float,
+                                 int,  # ETA
+                                 float, float,
+                                 int, int, int,
+                                 str, str,  # Tracker
+                                 str, str,
+                                 bool]  # shared
 
     def set_up(self):
         if libs_available is False:
diff --git a/tox.ini b/tox.ini
index 8b4d10d8f..c97a95738 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,7 +84,7 @@ whitelist_externals =
     isort
 commands =
     isort --version
-    python -c "import subprocess, sys; output = subprocess.check_output('isort --diff --recursive deluge docs packaging *.py', shell=True); print output; sys.exit(len(output) != 0)"
+    python -c "import subprocess, sys; output = subprocess.check_output('isort -q --diff --recursive deluge docs packaging *.py', shell=True); print output; sys.exit(len(output) != 0)"
 
 [testenv:flake8]
 setenv = {[testenv]setenv}