Run blocking tests in a thread.

This commit is contained in:
Itamar Turner-Trauring 2023-03-20 15:08:22 -04:00
parent 61d9d82c55
commit aba60d2719
2 changed files with 13 additions and 0 deletions

View File

@ -50,6 +50,7 @@ def test_put_from_stdin(alice, get_put_alias, tmpdir):
assert read_bytes(tempfile) == DATA assert read_bytes(tempfile) == DATA
@run_in_thread
def test_get_to_stdout(alice, get_put_alias, tmpdir): def test_get_to_stdout(alice, get_put_alias, tmpdir):
""" """
It's possible to upload a file, and then download it to stdout. It's possible to upload a file, and then download it to stdout.
@ -67,6 +68,7 @@ def test_get_to_stdout(alice, get_put_alias, tmpdir):
assert p.wait() == 0 assert p.wait() == 0
@run_in_thread
def test_large_file(alice, get_put_alias, tmp_path): def test_large_file(alice, get_put_alias, tmp_path):
""" """
It's possible to upload and download a larger file. It's possible to upload and download a larger file.

View File

@ -18,6 +18,7 @@ import allmydata.uri
from allmydata.util import jsonbytes as json from allmydata.util import jsonbytes as json
from . import util from . import util
from .util import run_in_thread
import requests import requests
import html5lib import html5lib
@ -25,6 +26,7 @@ from bs4 import BeautifulSoup
from pytest_twisted import ensureDeferred from pytest_twisted import ensureDeferred
@run_in_thread
def test_index(alice): def test_index(alice):
""" """
we can download the index file we can download the index file
@ -32,6 +34,7 @@ def test_index(alice):
util.web_get(alice, u"") util.web_get(alice, u"")
@run_in_thread
def test_index_json(alice): def test_index_json(alice):
""" """
we can download the index file as json we can download the index file as json
@ -41,6 +44,7 @@ def test_index_json(alice):
json.loads(data) json.loads(data)
@run_in_thread
def test_upload_download(alice): def test_upload_download(alice):
""" """
upload a file, then download it via readcap upload a file, then download it via readcap
@ -70,6 +74,7 @@ def test_upload_download(alice):
assert str(data, "utf-8") == FILE_CONTENTS assert str(data, "utf-8") == FILE_CONTENTS
@run_in_thread
def test_put(alice): def test_put(alice):
""" """
use PUT to create a file use PUT to create a file
@ -89,6 +94,7 @@ def test_put(alice):
assert cap.needed_shares == int(cfg.get_config("client", "shares.needed")) assert cap.needed_shares == int(cfg.get_config("client", "shares.needed"))
@run_in_thread
def test_helper_status(storage_nodes): def test_helper_status(storage_nodes):
""" """
successfully GET the /helper_status page successfully GET the /helper_status page
@ -101,6 +107,7 @@ def test_helper_status(storage_nodes):
assert str(dom.h1.string) == u"Helper Status" assert str(dom.h1.string) == u"Helper Status"
@run_in_thread
def test_deep_stats(alice): def test_deep_stats(alice):
""" """
create a directory, do deep-stats on it and prove the /operations/ create a directory, do deep-stats on it and prove the /operations/
@ -417,6 +424,7 @@ async def test_directory_deep_check(reactor, request, alice):
assert dom is not None, "Operation never completed" assert dom is not None, "Operation never completed"
@run_in_thread
def test_storage_info(storage_nodes): def test_storage_info(storage_nodes):
""" """
retrieve and confirm /storage URI for one storage node retrieve and confirm /storage URI for one storage node
@ -428,6 +436,7 @@ def test_storage_info(storage_nodes):
) )
@run_in_thread
def test_storage_info_json(storage_nodes): def test_storage_info_json(storage_nodes):
""" """
retrieve and confirm /storage?t=json URI for one storage node retrieve and confirm /storage?t=json URI for one storage node
@ -442,6 +451,7 @@ def test_storage_info_json(storage_nodes):
assert data[u"stats"][u"storage_server.reserved_space"] == 1000000000 assert data[u"stats"][u"storage_server.reserved_space"] == 1000000000
@run_in_thread
def test_introducer_info(introducer): def test_introducer_info(introducer):
""" """
retrieve and confirm /introducer URI for the introducer retrieve and confirm /introducer URI for the introducer
@ -460,6 +470,7 @@ def test_introducer_info(introducer):
assert "subscription_summary" in data assert "subscription_summary" in data
@run_in_thread
def test_mkdir_with_children(alice): def test_mkdir_with_children(alice):
""" """
create a directory using ?t=mkdir-with-children create a directory using ?t=mkdir-with-children