diff options
Diffstat (limited to 'deluge/tests/daemon_base.py')
-rw-r--r-- | deluge/tests/daemon_base.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/deluge/tests/daemon_base.py b/deluge/tests/daemon_base.py index 7352e0d32..3ae86c4ca 100644 --- a/deluge/tests/daemon_base.py +++ b/deluge/tests/daemon_base.py @@ -1,12 +1,9 @@ -# -*- coding: utf-8 -*- # # This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with # the additional special exception to link portions of this program with the OpenSSL library. # See LICENSE for more details. # -from __future__ import print_function, unicode_literals - import os.path import pytest @@ -14,24 +11,13 @@ from twisted.internet import defer from twisted.internet.error import CannotListenError import deluge.component as component -from deluge.common import windows_check from . import common -@pytest.mark.usefixtures('get_pytest_basetemp') -class DaemonBase(object): - basetemp = None - - if windows_check(): - skip = 'windows cant start_core not enough arguments for format string' - - @pytest.fixture - def get_pytest_basetemp(self, request): - self.basetemp = request.config.option.basetemp - +@pytest.mark.usefixtures('config_dir') +class DaemonBase: def common_set_up(self): - common.set_tmp_config_dir() self.listen_port = 58900 self.core = None return component.start() @@ -78,6 +64,7 @@ class DaemonBase(object): print_stdout=print_stdout, print_stderr=print_stderr, extra_callbacks=extra_callbacks, + config_directory=self.config_dir, ) yield d except CannotListenError as ex: |