test(integv2): remove dynamic record sizing test and related cleanup (#5644)

Author: kaukabrizvi

codebuild/spec/buildspec_integv2_nix.yml

@@ -131,7 +131,6 @@ phases:
           nix develop $NIXDEV_ARGS $NIXDEV_LIBCRYPTO --command bash -c "source ./nix/shell.sh; build"
         fi
   post_build:
-    # Dynamic_record_sizes is being excluded in nix/shell.sh and needs a rewrite.
     commands:
       - |
         set -e

codebuild/spec/buildspec_ubuntu_integrationv2.yml

@@ -41,7 +41,7 @@ batch:
             - "test_version_negotiation test_ocsp test_renegotiate test_serialization test_record_padding
                test_npn test_cross_compatibility test_renegotiate_apache test_hello_retry_requests
                test_sni_match test_pq_handshake test_fragmentation test_key_update
-               test_client_authentication test_dynamic_record_sizes test_sslyze test_sslv2_client_hello"
+               test_client_authentication test_sslyze test_sslv2_client_hello"
 
 env:
   variables:

flake.nix

@@ -30,7 +30,6 @@
           # We're not including openssl1.1.1 in our package list to avoid confusing cmake.
           # It will be in the PATH of our devShell for use in tests.
           pkgs.corretto21
-          pkgs.iproute2
           pkgs.apacheHttpd
           pkgs.procps
           # stress testing tool for linux

nix/shell.sh

@@ -86,8 +86,7 @@ function uvinteg {(
     set -eu
     TESTS="${1:-all}"
     apache2_start
-    # TODO: Dynamic Record Sizes needs a rewrite; skip for now.
-    PYTEST_ARGS="--provider-version $S2N_LIBCRYPTO -x -n auto --durations=10 -rpfs --ignore-glob=*test_dynamic_record_sizes*"
+    PYTEST_ARGS="--provider-version $S2N_LIBCRYPTO -x -n auto --durations=10 -rpfs"
     cd ./tests/integrationv2
     echo -n "Comparing the current list of integ tests against what is checked-in..."
     PYTHONPATH="" uv run pytest --collect-only $PYTEST_ARGS | grep Module > /tmp/uvinteg_tests.txt

tests/integrationv2/README.md

@@ -59,8 +59,6 @@ ubuntu@host:s2n_root/ $ make -C tests/integrationv2 all
 The Makefile automatically sets your PATH and LD_LIBRARY_PATH environment. It will execute `tox` to setup your
 Python environment. Then all the integration tests will be collected and executed.
 
-**Note** If you are running the dynamic record size test you will need to use `sudo`.
-
 ## Run one test
 
 If you only want to run a single test, you can set the `TOX_TEST_NAME` environment variable:

tests/integrationv2/fixtures.py

@@ -1,8 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-import os
 import pytest
-import subprocess
 
 from processes import ManagedProcess
 from providers import Provider, S2N
@@ -122,45 +120,3 @@ def _fn(
                 p.kill()
             else:
                 p.join()
-
-
-def _swap_mtu(device, new_mtu):
-    """
-    Swap the device's current MTU for the requested MTU.
-    Return the original MTU so it can be reset later.
-    """
-    cmd = ["ip", "link", "show", device]
-    p = subprocess.Popen(
-        cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
-    mtu = 65536
-    for line in p.stdout.readlines():
-        s = line.decode("utf-8")
-        pieces = s.split(" ")
-        if len(pieces) >= 4 and pieces[3] == "mtu":
-            mtu = int(pieces[4])
-
-    p.wait()
-
-    subprocess.call(["ip", "link", "set", device, "mtu", str(new_mtu)])
-
-    return int(mtu)
-
-
-@pytest.fixture(scope="module")
-def custom_mtu():
-    """
-    This fixture will swap the loopback's MTU from the default
-    to 1500, which is more reasonable for a network device.
-    Using a fixture allows us to reset the MTU even if the test
-    fails.
-
-    These values are all hardcoded because they are only used
-    from a single test. This simplifies the use of the fixture.
-    """
-    if os.geteuid() != 0:
-        pytest.skip("Test needs root privileges to modify lo MTU")
-
-    original_mtu = _swap_mtu("lo", 1500)
-    yield
-    _swap_mtu("lo", original_mtu)

tests/integrationv2/providers.py

@@ -111,44 +111,6 @@ def get_name(cls, cmd_line):
         return cmd_line[0]
 
 
-class Tcpdump(Provider):
-    """
-    TcpDump is used by the dynamic record test. It only needs to watch
-    a handful of packets before it can exit.
-
-    This class still follows the provider setup, but all values are hardcoded
-    because this isn't expected to be used outside of the dynamic record test.
-    """
-
-    def __init__(self, options: ProviderOptions):
-        Provider.__init__(self, options)
-
-    def setup_client(self):
-        self.ready_to_test_marker = "listening on lo"
-        tcpdump_filter = "dst port {}".format(self.options.port)
-
-        cmd_line = [
-            "tcpdump",
-            # Line buffer the output
-            "-l",
-            # Only read 10 packets before exiting. This is enough to find a large
-            # packet, and still exit before the timeout.
-            "-c",
-            "10",
-            # Watch the loopback device
-            "-i",
-            "lo",
-            # Don't resolve IP addresses
-            "-nn",
-            # Set the buffer size to 1k
-            "-B",
-            "1024",
-            tcpdump_filter,
-        ]
-
-        return cmd_line
-
-
 class S2N(Provider):
     """
     The S2N provider translates flags into s2nc/s2nd command line arguments.