Merge branch 'main' into rgs/llvm_points_to_bitfield

aws · Jan 5, 2022 · d817587 · d817587
2 parents faa3aa8 + 5a3b1ad
commit d817587
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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: