diff options
Diffstat (limited to 'deluge/plugins/WebUi')
-rwxr-xr-x | deluge/plugins/WebUi/create_dev_link.sh | 11 | ||||
-rw-r--r-- | deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/deluge/plugins/WebUi/create_dev_link.sh b/deluge/plugins/WebUi/create_dev_link.sh new file mode 100755 index 0000000..f4d60d2 --- /dev/null +++ b/deluge/plugins/WebUi/create_dev_link.sh @@ -0,0 +1,11 @@ +#!/bin/bash +BASEDIR=$(cd `dirname $0` && pwd) +CONFIG_DIR=$( test -z $1 && echo "/home/damien/.config/deluge/" || echo "$1") +[ -d "$CONFIG_DIR/plugins" ] || echo "Config dir "$CONFIG_DIR" is either not a directory or is not a proper deluge config directory. Exiting" +[ -d "$CONFIG_DIR/plugins" ] || exit 1 +cd $BASEDIR +test -d $BASEDIR/temp || mkdir $BASEDIR/temp +export PYTHONPATH=$BASEDIR/temp +python setup.py build develop --install-dir $BASEDIR/temp +cp $BASEDIR/temp/*.egg-link $CONFIG_DIR/plugins +rm -fr $BASEDIR/temp diff --git a/deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py b/deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py index 1badedc..413d259 100644 --- a/deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py +++ b/deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py @@ -8,7 +8,6 @@ import pytest import pytest_twisted -import deluge.component as component from deluge.core.core import Core from deluge.core.rpcserver import RPCServer from deluge.tests import common @@ -16,10 +15,9 @@ from deluge.tests import common common.disable_new_release_check() -@pytest.mark.usefixtures('component') class TestWebUIPlugin: @pytest_twisted.async_yield_fixture(autouse=True) - async def set_up(self, request): + async def set_up(self, request, component): self = request.instance self.rpcserver = RPCServer(listen=False) self.core = Core() @@ -27,11 +25,9 @@ class TestWebUIPlugin: yield - def on_shutdown(result): - del self.rpcserver - del self.core - - await component.shutdown().addCallback(on_shutdown) + await component.shutdown() + del self.rpcserver + del self.core def test_enable_webui(self): if 'WebUi' not in self.core.get_available_plugins(): |