Changeset f12b78e in trunk

Timestamp:

2023-03-21T13:43:45Z (2 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

559e2ec, a8832b1, d96a22e

Parents:

2dfabf79 (diff), 23b977a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2023-03-21 13:43:45)

git-committer:

GitHub <noreply@…> (2023-03-21 13:43:45)

Message:

Merge pull request #1271 from tahoe-lafs/3988-failing-test-http

Fix failing integration test

Fixes ticket:3988

Files:

• integration/conftest.py (modified) (3 diffs)
• integration/test_get_put.py (modified) (4 diffs)
• integration/test_servers_of_happiness.py (modified) (1 diff)
• integration/test_tor.py (modified) (1 diff)
• integration/test_web.py (modified) (11 diffs)
• integration/util.py (modified) (4 diffs)
• newsfragments/3988.minor (added)

integration/conftest.py ¶

@@ -394 +394 @@
         )
     )
-    await_client_ready(process)
+    pytest_twisted.blockon(await_client_ready(process))
 
     # 1. Create a new RW directory cap:
@@ -425 +425 @@
     # 4. Restart the node with new SFTP config.
     pytest_twisted.blockon(process.restart_async(reactor, request))
-    await_client_ready(process)
+    pytest_twisted.blockon(await_client_ready(process))
     print(f"Alice pid: {process.transport.pid}")
     return process
@@ -440 +440 @@
         )
     )
-    await_client_ready(process)
+    pytest_twisted.blockon(await_client_ready(process))
     return process
 

integration/test_get_put.py ¶

@@ -5 +5 @@
 
 from subprocess import Popen, PIPE, check_output, check_call
-import sys
 
 import pytest
@@ -51 +50 @@
 
 
+@run_in_thread
 def test_get_to_stdout(alice, get_put_alias, tmpdir):
     """
@@ -68 +68 @@
 
 
+@run_in_thread
 def test_large_file(alice, get_put_alias, tmp_path):
     """
@@ -86 +87 @@
 
 
-@pytest.mark.skipif(
-    sys.platform.startswith("win"),
-    reason="reconfigure() has issues on Windows"
-)
 @ensureDeferred
 async def test_upload_download_immutable_different_default_max_segment_size(alice, get_put_alias, tmpdir, request):

integration/test_servers_of_happiness.py ¶

@@ -32 +32 @@
         total=10,
     )
-    util.await_client_ready(edna)
+    yield util.await_client_ready(edna)
 
     node_dir = join(temp_dir, 'edna')

integration/test_tor.py ¶

@@ -43 +43 @@
     carol = yield _create_anonymous_node(reactor, 'carol', 8008, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl)
     dave = yield _create_anonymous_node(reactor, 'dave', 8009, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl)
-    util.await_client_ready(carol, minimum_number_of_servers=2)
-    util.await_client_ready(dave, minimum_number_of_servers=2)
+    yield util.await_client_ready(carol, minimum_number_of_servers=2)
+    yield util.await_client_ready(dave, minimum_number_of_servers=2)
 
     # ensure both nodes are connected to "a grid" by uploading

integration/test_web.py ¶

@@ -19 +19 @@
 
 from . import util
+from .util import run_in_thread
 
 import requests
@@ -26 +27 @@
 from pytest_twisted import ensureDeferred
 
+@run_in_thread
 def test_index(alice):
     """
@@ -33 +35 @@
 
 
+@run_in_thread
 def test_index_json(alice):
     """
@@ -42 +45 @@
 
 
+@run_in_thread
 def test_upload_download(alice):
     """
@@ -71 +75 @@
 
 
+@run_in_thread
 def test_put(alice):
     """
@@ -90 +95 @@
 
 
+@run_in_thread
 def test_helper_status(storage_nodes):
     """
@@ -102 +108 @@
 
 
+@run_in_thread
 def test_deep_stats(alice):
     """
@@ -418 +425 @@
 
 
+@run_in_thread
 def test_storage_info(storage_nodes):
     """
@@ -429 +437 @@
 
 
+@run_in_thread
 def test_storage_info_json(storage_nodes):
     """
@@ -443 +452 @@
 
 
+@run_in_thread
 def test_introducer_info(introducer):
     """
@@ -461 +471 @@
 
 
+@run_in_thread
 def test_mkdir_with_children(alice):
     """

integration/util.py ¶

@@ -431 +431 @@
 
 
+def run_in_thread(f):
+    """Decorator for integration tests that runs code in a thread.
+
+    Because we're using pytest_twisted, tests that rely on the reactor are
+    expected to return a Deferred and use async APIs so the reactor can run.
+
+    In the case of the integration test suite, it launches nodes in the
+    background using Twisted APIs.  The nodes stdout and stderr is read via
+    Twisted code.  If the reactor doesn't run, reads don't happen, and
+    eventually the buffers fill up, and the nodes block when they try to flush
+    logs.
+
+    We can switch to Twisted APIs (treq instead of requests etc.), but
+    sometimes it's easier or expedient to just have a blocking test.  So this
+    decorator allows you to run the test in a thread, and the reactor can keep
+    running in the main thread.
+
+    See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3597 for tracking bug.
+    """
+    @wraps(f)
+    def test(*args, **kwargs):
+        return deferToThread(lambda: f(*args, **kwargs))
+    return test
+
+
 def await_file_contents(path, contents, timeout=15, error_if=None):
     """
@@ -556 +581 @@
 
 
+@run_in_thread
 def await_client_ready(tahoe, timeout=10, liveness=60*2, minimum_number_of_servers=1):
     """
@@ -623 +649 @@
 
 
-def run_in_thread(f):
-    """Decorator for integration tests that runs code in a thread.
-
-    Because we're using pytest_twisted, tests that rely on the reactor are
-    expected to return a Deferred and use async APIs so the reactor can run.
-
-    In the case of the integration test suite, it launches nodes in the
-    background using Twisted APIs.  The nodes stdout and stderr is read via
-    Twisted code.  If the reactor doesn't run, reads don't happen, and
-    eventually the buffers fill up, and the nodes block when they try to flush
-    logs.
-
-    We can switch to Twisted APIs (treq instead of requests etc.), but
-    sometimes it's easier or expedient to just have a blocking test.  So this
-    decorator allows you to run the test in a thread, and the reactor can keep
-    running in the main thread.
-
-    See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3597 for tracking bug.
-    """
-    @wraps(f)
-    def test(*args, **kwargs):
-        return deferToThread(lambda: f(*args, **kwargs))
-    return test
-
 @frozen
 class CHK:
@@ -793 +795 @@
 
     if changed:
-        # TODO reconfigure() seems to have issues on Windows. If you need to
-        # use it there, delete this assert and try to figure out what's going
-        # on...
-        assert not sys.platform.startswith("win")
-
         # restart the node
         print(f"Restarting {node.node_dir} for ZFEC reconfiguration")
         await node.restart_async(reactor, request)
         print("Restarted.  Waiting for ready state.")
-        await_client_ready(node)
+        await await_client_ready(node)
         print("Ready.")
     else: