diff --git a/.ci/build-kit/scripts/create_integration_image.sh b/.ci/build-kit/scripts/create_integration_image.sh index 042f7f6e12..cdddfcf454 100755 --- a/.ci/build-kit/scripts/create_integration_image.sh +++ b/.ci/build-kit/scripts/create_integration_image.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash rsync -a "$EXT_MOUNT/source/tests" ./ retVal=$? @@ -8,6 +8,22 @@ if [ $retVal -ne 0 ]; then exit $retVal fi +python3 -m venv "$EXT_MOUNT/venv" --system-site-packages +retVal=$? + +if [ $retVal -ne 0 ]; then + echo "Failed to create virtual environment" + exit $retVal +fi + +source "$EXT_MOUNT/venv/bin/activate" +retVal=$? + +if [ $retVal -ne 0 ]; then + echo "Failed to activate virtual environment" + exit $retVal +fi + pip install --break-system-packages \ $EXT_MOUNT/wheels/everestpy-*.whl \ $EXT_MOUNT/wheels/everest_testing-*.whl \ diff --git a/.ci/build-kit/scripts/create_ocpp_tests_image.sh b/.ci/build-kit/scripts/create_ocpp_tests_image.sh index db2f25d44e..e663d99d85 100755 --- a/.ci/build-kit/scripts/create_ocpp_tests_image.sh +++ b/.ci/build-kit/scripts/create_ocpp_tests_image.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash rsync -a "$EXT_MOUNT/source/tests" ./ retVal=$? @@ -8,6 +8,22 @@ if [ $retVal -ne 0 ]; then exit $retVal fi +python3 -m venv "$EXT_MOUNT/venv" --system-site-packages +retVal=$? + +if [ $retVal -ne 0 ]; then + echo "Failed to create virtual environment" + exit $retVal +fi + +source "$EXT_MOUNT/venv/bin/activate" +retVal=$? + +if [ $retVal -ne 0 ]; then + echo "Failed to activate virtual environment" + exit $retVal +fi + pip install --break-system-packages \ "$EXT_MOUNT"/wheels/everestpy-*.whl \ "$EXT_MOUNT"/wheels/everest_testing-*.whl \ diff --git a/.ci/e2e/scripts/run_integration_tests.sh b/.ci/e2e/scripts/run_integration_tests.sh index 6179499258..5d9c613f34 100755 --- a/.ci/e2e/scripts/run_integration_tests.sh +++ b/.ci/e2e/scripts/run_integration_tests.sh @@ -1,4 +1,11 @@ -#!/bin/sh +#!/bin/bash + +source "$EXT_MOUNT/venv/bin/activate" +retVal=$? +if [ $retVal -ne 0 ]; then + echo "Failed to activate virtual environment" + exit $retVal +fi cd tests pytest \ diff --git a/.ci/e2e/scripts/run_ocpp_tests.sh b/.ci/e2e/scripts/run_ocpp_tests.sh index 905626a7e7..76e4519b17 100755 --- a/.ci/e2e/scripts/run_ocpp_tests.sh +++ b/.ci/e2e/scripts/run_ocpp_tests.sh @@ -1,4 +1,11 @@ -#!/bin/sh +#!/bin/bash + +source "$EXT_MOUNT/venv/bin/activate" +retVal=$? +if [ $retVal -ne 0 ]; then + echo "Failed to activate virtual environment" + exit $retVal +fi cd tests diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 03fe268b83..b1fc7aba01 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -18,7 +18,7 @@ on: jobs: ci: name: Build, Lint and Test - uses: everest/everest-ci/.github/workflows/continuous_integration.yml@v1.4.6 + uses: everest/everest-ci/.github/workflows/continuous_integration.yml@chore/update-to-debian-trixie permissions: contents: read secrets: @@ -30,6 +30,7 @@ jobs: do_not_run_coverage_badge_creation: true run_install_wheels: true run_integration_tests: true + build_kit_base_image_tag: chore-update-to-debian-trixie ocpp-tests: name: OCPP Tests needs: diff --git a/lib/everest/tls/tests/openssl_util_test.cpp b/lib/everest/tls/tests/openssl_util_test.cpp index d64d479e1f..5bc7bab75f 100644 --- a/lib/everest/tls/tests/openssl_util_test.cpp +++ b/lib/everest/tls/tests/openssl_util_test.cpp @@ -254,26 +254,26 @@ TEST(openssl, base64EncodeNl) { } TEST(openssl, base64Decode) { - auto res = openssl::base64_decode(&iso_exi_a_hash_b64[0], sizeof(iso_exi_a_hash_b64)); + auto res = openssl::base64_decode(iso_exi_a_hash_b64, std::strlen(iso_exi_a_hash_b64)); ASSERT_EQ(res.size(), sizeof(iso_exi_a_hash)); EXPECT_EQ(std::memcmp(res.data(), &iso_exi_a_hash[0], res.size()), 0); - res = openssl::base64_decode(&iso_exi_sig_b64[0], sizeof(iso_exi_sig_b64)); + res = openssl::base64_decode(iso_exi_sig_b64, std::strlen(iso_exi_sig_b64)); ASSERT_EQ(res.size(), sizeof(iso_exi_sig)); EXPECT_EQ(std::memcmp(res.data(), &iso_exi_sig[0], res.size()), 0); std::array buffer{}; std::size_t buffer_len = buffer.size(); - EXPECT_TRUE(openssl::base64_decode(&iso_exi_a_hash_b64[0], sizeof(iso_exi_a_hash_b64), buffer.data(), buffer_len)); + EXPECT_TRUE(openssl::base64_decode(iso_exi_a_hash_b64, std::strlen(iso_exi_a_hash_b64), buffer.data(), buffer_len)); ASSERT_EQ(buffer_len, sizeof(iso_exi_a_hash)); EXPECT_EQ(std::memcmp(buffer.data(), &iso_exi_a_hash[0], buffer_len), 0); } TEST(openssl, base64DecodeNl) { - auto res = openssl::base64_decode(&iso_exi_a_hash_b64_nl[0], sizeof(iso_exi_a_hash_b64_nl)); + auto res = openssl::base64_decode(iso_exi_a_hash_b64_nl, std::strlen(iso_exi_a_hash_b64_nl)); ASSERT_EQ(res.size(), sizeof(iso_exi_a_hash)); EXPECT_EQ(std::memcmp(res.data(), &iso_exi_a_hash[0], res.size()), 0); - res = openssl::base64_decode(&iso_exi_sig_b64_nl[0], sizeof(iso_exi_sig_b64_nl)); + res = openssl::base64_decode(iso_exi_sig_b64_nl, std::strlen(iso_exi_sig_b64_nl)); ASSERT_EQ(res.size(), sizeof(iso_exi_sig)); EXPECT_EQ(std::memcmp(res.data(), &iso_exi_sig[0], res.size()), 0); @@ -281,7 +281,7 @@ TEST(openssl, base64DecodeNl) { std::size_t buffer_len = buffer.size(); EXPECT_TRUE( - openssl::base64_decode(&iso_exi_a_hash_b64_nl[0], sizeof(iso_exi_a_hash_b64_nl), buffer.data(), buffer_len)); + openssl::base64_decode(iso_exi_a_hash_b64_nl, std::strlen(iso_exi_a_hash_b64_nl), buffer.data(), buffer_len)); ASSERT_EQ(buffer_len, sizeof(iso_exi_a_hash)); EXPECT_EQ(std::memcmp(buffer.data(), &iso_exi_a_hash[0], buffer_len), 0); } diff --git a/modules/HardwareDrivers/PowerSupplies/Huawei_V100R023C10/fusion_charger_lib/goose-lib/libs/goose/tests/sender.cpp b/modules/HardwareDrivers/PowerSupplies/Huawei_V100R023C10/fusion_charger_lib/goose-lib/libs/goose/tests/sender.cpp index 0fd48c4638..a1bff6cea5 100644 --- a/modules/HardwareDrivers/PowerSupplies/Huawei_V100R023C10/fusion_charger_lib/goose-lib/libs/goose/tests/sender.cpp +++ b/modules/HardwareDrivers/PowerSupplies/Huawei_V100R023C10/fusion_charger_lib/goose-lib/libs/goose/tests/sender.cpp @@ -4,6 +4,8 @@ #include +#include + class DummyEthernetInterface : public goose_ethernet::EthernetInterfaceIntf { std::function send_callback; std::function()> receive_callback;