diff --git a/.github/workflows/hosted_runners.yml b/.github/workflows/hosted_runners.yml index 7328f2fd84b..e04eb8d5be2 100644 --- a/.github/workflows/hosted_runners.yml +++ b/.github/workflows/hosted_runners.yml @@ -23,6 +23,7 @@ on: branches: - 'master' - 'main' + - 'stefano/fix/macos-15-tests' tags: - '*' @@ -251,6 +252,7 @@ jobs: # The Linux build will only start once we know that the code # has been properly formatted build_linux: + if: false needs: [check_code_style, check_libraries_manifest] runs-on: ${{ matrix.os }} @@ -951,6 +953,7 @@ jobs: # The Windows build will only start once we know that the code # has been properly formatted build_windows: + if: false needs: [check_code_style, check_libraries_manifest] runs-on: ${{ matrix.os }} diff --git a/osquery/remote/tests/test_utils.cpp b/osquery/remote/tests/test_utils.cpp index db9a896b3ba..4643060ff23 100644 --- a/osquery/remote/tests/test_utils.cpp +++ b/osquery/remote/tests/test_utils.cpp @@ -155,6 +155,9 @@ bool TLSServerRunner::start(const std::string& server_cert, if (!started) { return false; } + + LOG(WARNING) << "Python server started correctly"; + return true; } diff --git a/plugins/config/tests/tls_config_tests.cpp b/plugins/config/tests/tls_config_tests.cpp index f0e44cb5099..6a4aa285e5e 100644 --- a/plugins/config/tests/tls_config_tests.cpp +++ b/plugins/config/tests/tls_config_tests.cpp @@ -154,10 +154,10 @@ TEST_F(TLSConfigTests, test_setup) { request.setOption("hostname", Flag::getValue("tls_hostname")); status = request.call(JSON()); - ASSERT_TRUE(status.ok()); + ASSERT_TRUE(status.ok()) << status.getMessage(); status = request.getResponse(response_tree); - ASSERT_TRUE(status.ok()); + ASSERT_TRUE(status.ok()) << status.getMessage(); // TLSConfigPlugin should *not* have sent an enroll or any other TLS request // It should have used the cached-key diff --git a/tools/tests/test_http_server.py b/tools/tests/test_http_server.py index b56ea7f07d6..e77f53b4e70 100755 --- a/tools/tests/test_http_server.py +++ b/tools/tests/test_http_server.py @@ -9,6 +9,7 @@ import argparse import base64 +from datetime import datetime import json import os import random @@ -127,7 +128,7 @@ def debug(response): if ARGS["verbose"]: - print("-- [DEBUG] %s" % str(response)) + print(f"-- [DEBUG] {datetime.now().isoformat()} {str(response)}") sys.stdout.flush() sys.stderr.flush()