updated test suite

3 files changed, 2 insertions, 140 deletions

diff --git a/tests/config/plugin.conf b/tests/config/plugin.conf
deleted file mode 100644
index 5e7ee3858..000000000
--- a/tests/config/plugin.conf
+++ /dev/null
@@ -1,138 +0,0 @@
-version: 2
-
-[MultiuploadCom]
-preferedHoster = multiupload
-ignoredHoster = 
-
-[SerienjunkiesOrg]
-preferredHoster = RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,MegauploadCom,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom
-changeName = True
-
-[EmbeduploadCom]
-preferedHoster = embedupload
-ignoredHoster = 
-
-[MultiloadCz]
-usedHoster = 
-ignoredHoster = 
-
-[WiiReloadedOrg]
-changeName = True
-
-[Xdcc]
-nick = pyload
-ident = pyloadident
-realname = pyloadreal
-
-[UlozTo]
-reuseCaptcha = True
-captchaUser = 
-captchaNb = 
-
-[YoutubeCom]
-quality = hd
-fmt = 0
-.mp4 = True
-.flv = True
-.webm = False
-.3gp = False
-
-[RapidshareCom]
-server = None
-
-[VeehdCom]
-filename_spaces = False
-replacement_char = _
-
-[RealdebridCom]
-https = False
-
-[ClickAndLoad]
-activated = True
-extern = False
-
-[ExtractArchive]
-activated = True
-fullpath = True
-overwrite = True
-passwordfile = unrar_passwords.txt
-deletearchive = False
-subfolder = False
-destination = 
-queue = True
-renice = 0
-
-[CaptchaTrader]
-activated = True
-username = 
-force = False
-passkey = 
-
-[MergeFiles]
-activated = False
-
-[IRCInterface]
-activated = False
-host = Enter your server here!
-port = 6667
-ident = pyload-irc
-realname = pyload-irc
-nick = pyLoad-IRC
-owner = Enter your nick here!
-info_file = False
-info_pack = True
-captcha = True
-
-[Ev0InFetcher]
-activated = False
-interval = 10
-queue = False
-shows = 
-quality = xvid
-hoster = NetloadIn,RapidshareCom,MegauploadCom,HotfileCom
-
-[EasybytezCom]
-activated = False
-includeHoster = 
-excludeHoster = 
-
-[XMPPInterface]
-activated = False
-jid = user@exmaple-jabber-server.org
-pw = 
-tls = False
-owners = me@icq-gateway.org;some@msn-gateway.org
-info_file = False
-info_pack = True
-captcha = True
-
-[RehostTo]
-activated = False
-
-[MultiHoster]
-activated = True
-
-[MultiHome]
-activated = False
-interfaces = None
-
-[MultishareCz]
-activated = False
-includeHoster = 
-excludeHoster = rapidshare.com|uloz.to
-
-[HotFolder]
-activated = False
-folder = container
-watch_file = False
-keep = True
-file = links.txt
-
-[ExternalScripts]
-activated = True
-
-[UpdateManager]
-activated = True
-interval = 360
-debug = False
-
diff --git a/tests/config/pyload.conf.org b/tests/config/pyload.conf.org
index 7fb1c8c87..0a422f258 100644
--- a/tests/config/pyload.conf.org
+++ b/tests/config/pyload.conf.org
@@ -3,7 +3,7 @@ version: 2
 [remote]
 nolocalauth = False
 activated = True
-port = 7227
+port = 7558
 listenaddr = 127.0.0.1
 
 [log]
@@ -44,7 +44,7 @@ prefix =
 server = builtin
 host = 127.0.0.1
 https = False
-port = 8001
+port = 8921
 
 [proxy]
 username = 
diff --git a/tests/config/pyload.db.org b/tests/config/pyload.db.org
index d340531c5..26af474c1 100644
--- a/tests/config/pyload.db.org
+++ b/tests/config/pyload.db.org