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 f594697d2..82339b3b1 100644 Binary files a/deluge/tests/google.ico and b/deluge/tests/google.ico differ 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}