From 3a8e84a86efba76d76985614d8da540f526d9b38 Mon Sep 17 00:00:00 2001 From: grdddj Date: Thu, 30 Jun 2022 13:47:02 +0200 Subject: [PATCH] fix(ci): make Connect tests run properly --- ci/test.yml | 6 +++--- tests/connect_tests/connect_tests.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/test.yml b/ci/test.yml index 4fa14f816..7cf16729c 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -685,7 +685,7 @@ core unix memory profiler: # Connect connect test core: - image: ghcr.io/trezor/trezor-user-env + image: ghcr.io/trezor/trezor-user-env:185 stage: test needs: - core unix frozen debug build @@ -693,8 +693,8 @@ connect test core: SDL_VIDEODRIVER: "dummy" before_script: - cp /builds/satoshilabs/trezor/trezor-firmware/core/build/unix/trezor-emu-core /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99 - - chmod u+x /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99 - - nix-shell -p autoPatchelfHook SDL2 SDL2_image --run "autoPatchelf /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99" + - chmod +x /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99 + - nix-shell --run "autoPatchelf /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99" script: - /trezor-user-env/run-nix.sh & - nix-shell --run "tests/connect_tests/connect_tests.sh 2.99.99" diff --git a/tests/connect_tests/connect_tests.sh b/tests/connect_tests/connect_tests.sh index 4e95bf0fa..b947eaf5b 100755 --- a/tests/connect_tests/connect_tests.sh +++ b/tests/connect_tests/connect_tests.sh @@ -17,6 +17,9 @@ else cd ${CONNECT_DIR} fi +echo "Changing 'localhost' to '127.0.0.1' in websocket client as a workaround for CI servers" +sed -i 's/localhost/127.0.0.1/g' ./tests/websocket-client.js + # Taking an optional script argument with emulator version if [ ! -z "${1}" ] then