Skip to content

Commit 4720791

Browse files
authored
Fix socat test (#2388)
### Issues: Addresses V1753367409 ### Description of changes: * Move socat integration test out of CodeBuild * The tests that were failing that involve to signals and child processes. We've had similar trouble with the libssh2 test running in CodeBuild. * Update integration test script so it fails with script modifications are not applied. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
1 parent 1de6299 commit 4720791

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.github/workflows/integrations.yml

+14
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,20 @@ jobs:
4848
- name: Run librdkafka build
4949
run: |
5050
./tests/ci/integration/run_librdkafka_integration.sh
51+
socat:
52+
if: github.repository_owner == 'aws'
53+
runs-on: ubuntu-latest
54+
env:
55+
SHELL: /usr/bin/bash
56+
steps:
57+
- name: Install OS Dependencies
58+
run: |
59+
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
60+
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make autoconf pkg-config openssl
61+
- uses: actions/checkout@v4
62+
- name: Run socat integration test
63+
run: |
64+
./tests/ci/integration/run_socat_integration.sh
5165
rust-openssl:
5266
if: github.repository_owner == 'aws'
5367
runs-on: ubuntu-latest

tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,6 @@ batch:
291291
variables:
292292
AWS_LC_CI_TARGET: "tests/ci/integration/run_tcpdump_integration.sh"
293293

294-
- identifier: socat_integration_x86_64
295-
buildspec: tests/ci/codebuild/common/run_nonroot_target.yml
296-
env:
297-
type: LINUX_CONTAINER
298-
privileged-mode: false
299-
compute-type: BUILD_GENERAL1_MEDIUM
300-
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-22.04_gcc-12x_integration_latest
301-
variables:
302-
AWS_LC_CI_TARGET: "tests/ci/integration/run_socat_integration.sh"
303-
LOGNAME: "postgres"
304-
305294
- identifier: openldap_integration_x86_64
306295
buildspec: tests/ci/codebuild/common/run_simple_target.yml
307296
env:

tests/ci/integration/run_socat_integration.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ function build_and_test_socat() {
2727
# See: t/V1497389456.
2828
# socat decreased the test wait time to 3 milliseconds, which causes failures when additional warnings/logs are written.
2929
# Extending the wait time to 50 milliseconds is just right for us.
30-
sed -i 's/MILLIs=\$((3/MILLIs=\$((50/' ./test.sh
30+
# Use Perl so the command will fail if no replacement performed:
31+
perl -pi -e 'BEGIN{$x=0} $x=1 if s/MICROS=\${MILLIs}000/MICROS=50000/; END{exit 1 if !$x}' ./test.sh
3132
# test 146 OPENSSLLISTENDSA: fails because AWS-LC doesn't support FFDH ciphersuites which are needed for DSA
3233
# test 216 UDP6MULTICAST_UNIDIR: known flaky test in socat with newer kernels
3334
# test 309 OPENSSLRENEG1: AWS-LC doesn't support renegotiation by default, it can be enabled by calling SSL_set_renegotiate_mode

0 commit comments

Comments
 (0)