Move base_test_channel to Core

Tribler · Jul 18, 2016 · 3b92877 · 3b92877
1 parent d0407a9
commit 3b92877
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/Tribler/Test/Core/CreditMining/test_creditmining_sys.py b/Tribler/Test/Core/CreditMining/test_creditmining_sys.py
@@ -16,19 +16,17 @@
 from Tribler.Core.DownloadConfig import DefaultDownloadStartupConfig
 from Tribler.Core.TorrentDef import TorrentDef
 from Tribler.Core.Utilities.twisted_thread import deferred, reactor
-from Tribler.Core.simpledefs import NTFY_TORRENTS, NTFY_UPDATE, NTFY_CHANNELCAST
+from Tribler.Core.simpledefs import NTFY_TORRENTS, NTFY_UPDATE
 from Tribler.Main.Utility.GuiDBTuples import CollectedTorrent
 from Tribler.Policies.BoostingManager import BoostingManager, BoostingSettings
 from Tribler.Test.Core.CreditMining.mock_creditmining import MockLtTorrent, ResourceFailClass
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
-from Tribler.Test.test_as_server import TestAsServer
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 from Tribler.Test.common import TORRENT_UBUNTU_FILE, TORRENT_UBUNTU_FILE_INFOHASH, TESTS_DATA_DIR
+from Tribler.Test.test_as_server import TestAsServer
 from Tribler.Test.util import prepare_xml_rss
-from Tribler.community.allchannel.community import AllChannelCommunity
 from Tribler.community.channel.community import ChannelCommunity
 from Tribler.dispersy.dispersy import Dispersy
 from Tribler.dispersy.endpoint import ManualEnpoint
-from Tribler.dispersy.member import DummyMember
 from Tribler.dispersy.util import blocking_call_on_reactor_thread
 
 

diff --git a/Tribler/Test/Core/Modules/Channel/test_channel.py b/Tribler/Test/Core/Modules/Channel/test_channel.py
@@ -1,6 +1,6 @@
 from Tribler.Core.Modules.channel.channel import ChannelObject
 from Tribler.Core.Modules.channel.channel_rss import ChannelRssParser
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 
 
 class TestChannel(BaseTestChannel):

diff --git a/Tribler/Test/Core/Modules/Channel/test_channel_rss.py b/Tribler/Test/Core/Modules/Channel/test_channel_rss.py
@@ -1,9 +1,11 @@
 import os
+
 from twisted.internet.defer import DeferredList
+
 from Tribler.Core.Modules.channel.cache import SimpleCache
 from Tribler.Core.Modules.channel.channel_rss import ChannelRssParser, RSSFeedParser
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
 from Tribler.Test.Core.base_test import TriblerCoreTest
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 from Tribler.Test.common import TESTS_DATA_DIR
 
 

diff --git a/Tribler/Test/Core/Modules/RestApi/base_api_test.py b/Tribler/Test/Core/Modules/RestApi/base_api_test.py
@@ -1,14 +1,15 @@
 import json
 import urllib
+from zope.interface import implements
+
 from twisted.internet.defer import succeed
 from twisted.web.client import Agent, readBody
 from twisted.web.http_headers import Headers
 from twisted.web.iweb import IBodyProducer
-from zope.interface import implements
+
 from Tribler.Core.Utilities.twisted_thread import reactor
 from Tribler.Core.version import version_id
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
-from Tribler.Test.test_as_server import TestAsServer
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 
 
 class POSTDataProducer(object):

diff --git a/...Core/Modules/Channel/base_test_channel.py → Tribler/Test/Core/base_test_channel.py b/...Core/Modules/Channel/base_test_channel.py → Tribler/Test/Core/base_test_channel.py