From aa2066e2214269d0cd9e0f8ffdba06d50a274b12 Mon Sep 17 00:00:00 2001 From: meejah Date: Tue, 12 May 2020 16:57:37 -0600 Subject: [PATCH] move imports --- integration/test_grid_manager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/integration/test_grid_manager.py b/integration/test_grid_manager.py index 38c2dd78a..07b8a9083 100644 --- a/integration/test_grid_manager.py +++ b/integration/test_grid_manager.py @@ -10,6 +10,9 @@ from allmydata.util import base32 from allmydata.util import configutil import util +from grid import ( + create_grid, +) import pytest_twisted @@ -110,7 +113,6 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a using Grid Manager and there is only 1 storage server with a valid certificate. """ - from grid import create_grid grid = yield create_grid(reactor, request, temp_dir, flog_gatherer, port_allocator) storage0 = yield grid.add_storage_node() storage1 = yield grid.add_storage_node() @@ -161,7 +163,7 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a with open(join(diana.process.node_dir, "tahoe.cfg"), "w") as f: config.write(f) - yield diana.restart(reactor, request) + yield diana.restart(reactor, request, servers=2) # try to put something into the grid, which should fail (because # diana has happy=2 but should only find storage0 to be acceptable