From 5a3b1ad01d0ebde3e3c55d5d4a43242458424ca5 Mon Sep 17 00:00:00 2001 From: Sam Clark <3758302+goatgoose@users.noreply.github.com> Date: Wed, 5 Jan 2022 16:55:02 -0500 Subject: [PATCH] Conflicting ports in integration test (#3161) * create result with exception message * increase s2nd port Co-authored-by: Sam Clark --- tests/integration/Makefile | 2 +- tests/integration/common/s2n_test_common.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/Makefile b/tests/integration/Makefile index 4165799a736..1b08b2271cc 100644 --- a/tests/integration/Makefile +++ b/tests/integration/Makefile @@ -13,7 +13,7 @@ # permissions and limitations under the License. # -S2ND_PORT=8888 +S2ND_PORT=18888 S2ND_HOST=127.0.0.1 # If the libcrypto that s2n was built with is not specified, assume latest(1.1.1). diff --git a/tests/integration/common/s2n_test_common.py b/tests/integration/common/s2n_test_common.py index f5008e1a744..83fe5086efe 100644 --- a/tests/integration/common/s2n_test_common.py +++ b/tests/integration/common/s2n_test_common.py @@ -122,7 +122,7 @@ def __test(scenario): result = Result("Server process crashed") except AssertionError as error: - result = Result(error) + result = Result(str(error)) finally: cleanup_processes(server, client) if client: