mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-13 00:44:55 +08:00
John Chilton
4086dd61da
- Add monitor tag on toolbox root elements to force Galaxy to watch the toolbox for changes. - Refactoring and test improvements for existing tool monitoring code. - Implement toolbox shutdown process to ensure different watchers don't compete with each other. - Set the default tool conf to be monitored.
87 lines
2.1 KiB
Python
87 lines
2.1 KiB
Python
from contextlib import contextmanager
|
|
from os import path
|
|
from shutil import rmtree
|
|
import tempfile
|
|
import time
|
|
|
|
from galaxy.tools.toolbox import watcher
|
|
from galaxy.util import bunch
|
|
|
|
|
|
def test_watcher():
|
|
if not watcher.can_watch:
|
|
from nose.plugins.skip import SkipTest
|
|
raise SkipTest()
|
|
|
|
with __test_directory() as t:
|
|
tool_path = path.join(t, "test.xml")
|
|
toolbox = Toolbox()
|
|
open(tool_path, "w").write("a")
|
|
tool_watcher = watcher.get_tool_watcher(toolbox, bunch.Bunch(
|
|
watch_tools=True
|
|
))
|
|
tool_watcher.watch_file(tool_path, "cool_tool")
|
|
assert not toolbox.was_reloaded("cool_tool")
|
|
open(tool_path, "w").write("b")
|
|
wait_for_reload(lambda: toolbox.was_reloaded("cool_tool"))
|
|
tool_watcher.shutdown()
|
|
assert not tool_watcher.observer.is_alive()
|
|
|
|
|
|
def test_tool_conf_watcher():
|
|
if not watcher.can_watch:
|
|
from nose.plugins.skip import SkipTest
|
|
raise SkipTest()
|
|
|
|
callback = CallbackRecorder()
|
|
conf_watcher = watcher.get_tool_conf_watcher(callback.call)
|
|
|
|
with __test_directory() as t:
|
|
tool_conf_path = path.join(t, "test_conf.xml")
|
|
conf_watcher.watch_file(tool_conf_path)
|
|
|
|
open(tool_conf_path, "w").write("b")
|
|
wait_for_reload(lambda: callback.called)
|
|
conf_watcher.shutdown()
|
|
assert not conf_watcher.thread.is_alive()
|
|
|
|
|
|
def wait_for_reload(check):
|
|
reloaded = False
|
|
for i in range(10):
|
|
reloaded = check()
|
|
if reloaded:
|
|
break
|
|
time.sleep(.2)
|
|
assert reloaded
|
|
|
|
|
|
class Toolbox(object):
|
|
|
|
def __init__(self):
|
|
self.reloaded = {}
|
|
|
|
def reload_tool_by_id( self, tool_id ):
|
|
self.reloaded[ tool_id ] = True
|
|
|
|
def was_reloaded(self, tool_id):
|
|
return self.reloaded.get( tool_id, False )
|
|
|
|
|
|
class CallbackRecorder(object):
|
|
|
|
def __init__(self):
|
|
self.called = False
|
|
|
|
def call(self):
|
|
self.called = True
|
|
|
|
|
|
@contextmanager
|
|
def __test_directory():
|
|
base_path = tempfile.mkdtemp()
|
|
try:
|
|
yield base_path
|
|
finally:
|
|
rmtree(base_path)
|