X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c10049e10195f88b1eefec26f70f5019d316cc8..259b27b6f2d5457569b6639d625f5da255a73413:/mytest.py

diff --git a/mytest.py b/mytest.py
index 8ae28ab8..4b6062aa 100644
--- a/mytest.py
+++ b/mytest.py
@@ -17,7 +17,7 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
-from Tools.Directories import InitFallbackFiles
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
@@ -29,19 +29,20 @@ try:
 	
 	def runReactor():
 		reactor.run()
-except:
+except ImportError:
 	print "twisted not available"
 	def runReactor():
 		runMainloop()
 
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
-plugins.readPluginList()
+plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
 from Screens.Wizard import wizardManager
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
+from Plugins.Plugin import PluginDescriptor
 
 had = dict()
 
@@ -270,12 +271,19 @@ def runScreenTest():
 	
 	session.nav = Navigation()
 	
-	screensToRun = wizardManager.getWizards()
+	screensToRun = [ ]
+	
+	for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
+		screensToRun.append(p.__call__)
+	
+	screensToRun += wizardManager.getWizards()
+	
 	screensToRun.append(Screens.InfoBar.InfoBar)
 
 	def runNextScreen(session, screensToRun, *result):
 		if result:
-			quitMainloop(result)
+			quitMainloop(*result)
+			return
 	
 		screen = screensToRun[0]