commit bcf5b6c9cf6b89c49cce4a9c9c65a588877a8c95 Author: juga0 juga@riseup.net Date: Mon Jul 23 22:36:48 2018 +0000

Remove unneded sbwshome fixture in tests --- tests/integration/conftest.py | 5 ----- tests/integration/core/test_scanner.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 727148f..1cadb3b 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -78,11 +78,6 @@ SafeLogging 0

@pytest.fixture(scope='session') -def sbwshome(sbwshome_dir, args, conf): - return sbwshome_dir - - -@pytest.fixture(scope='session') def persistent_launch_tor(conf): cont = launch_tor(conf) return cont diff --git a/tests/integration/core/test_scanner.py b/tests/integration/core/test_scanner.py index fc9a6c5..61927d7 100644 --- a/tests/integration/core/test_scanner.py +++ b/tests/integration/core/test_scanner.py @@ -17,7 +17,7 @@ def assert_within(value, target, radius):

def test_measure_relay_with_maxadvertisedbandwidth( - persistent_launch_tor, sbwshome, args, conf, + persistent_launch_tor, sbwshome_dir, args, conf, dests, cb, rl, caplog): caplog.set_level(logging.DEBUG) # d = get_everything_to_measure(sbwshome, cont, args, conf)