From ef9bc248c2ef9c282146a27a1f5ea992377ddf53 Mon Sep 17 00:00:00 2001
From: vianney <vianney.ruhlmann@datadoghq.com>
Date: Fri, 20 Sep 2024 17:22:58 +0200
Subject: [PATCH] Fix test agent tests in CI

---
 .github/workflows/test.yml    | 16 ++++++++--------
 tools/docker/Dockerfile.build |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a80b20a904..4fb6bde314 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,21 +54,21 @@ jobs:
       - name: "[${{ steps.rust-version.outputs.version}}] cargo build --workspace --exclude builder --verbose"
         shell: bash
         run: cargo build --workspace --exclude builder --verbose
-      - name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(::require_test_agent::)'"
+      - name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(require_test_agent::)'"
         shell: bash
         # Run doc tests with cargo test and run tests with nextest and generate junit.xml
-        run: cargo test --workspace --exclude builder --doc --verbose && cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(::require_test_agent::)'
+        run: cargo test --workspace --exclude builder --doc --verbose && cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(require_test_agent::)'
         env:
           RUST_BACKTRACE: 1
-      - name: "[${{ steps.rust-version.outputs.version}}] Test agent tests: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(::require_test_agent::)'"
+      - name: "[${{ steps.rust-version.outputs.version}}] Test agent tests: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(require_test_agent::)'"
         if: runner.os == 'Linux'
         shell: bash
-        run: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(::require_test_agent::)'
+        run: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(require_test_agent::)'
         env:
           RUST_BACKTRACE: 1
-      - name: "[${{ steps.rust-version.outputs.version}}] RUSTFLAGS=\"-C prefer-dynamic\" cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(::require_test_agent::)'"
+      - name: "[${{ steps.rust-version.outputs.version}}] RUSTFLAGS=\"-C prefer-dynamic\" cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(require_test_agent::)'"
         shell: bash
-        run: cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(::require_test_agent::)'
+        run: cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(require_test_agent::)'
         env:
           RUSTFLAGS: "-C prefer-dynamic"
           RUST_BACKTRACE: 1
@@ -220,8 +220,8 @@ jobs:
           rust_version: cross-centos7
       - run: cargo install cross || true
       - run: cross build --workspace --target x86_64-unknown-linux-gnu --exclude builder 
-      - run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder  -- --skip "::single_threaded_tests::" --skip "::require_test_agent::"
-      - run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "::require_test_agent::"
+      - run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder  -- --skip "::single_threaded_tests::" --skip "require_test_agent::"
+      - run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "require_test_agent::"
 
   ffi_bake:
     strategy:
diff --git a/tools/docker/Dockerfile.build b/tools/docker/Dockerfile.build
index a07ca03f38..568e9d82cd 100644
--- a/tools/docker/Dockerfile.build
+++ b/tools/docker/Dockerfile.build
@@ -20,7 +20,7 @@ ENV CARGO_HOME="/root/.cargo"
 WORKDIR /build
 
 RUN apk update \
-    && apk add --no-cache \
+  && apk add --no-cache \
     build-base \
     cargo \
     cmake \
@@ -33,7 +33,7 @@ RUN apk update \
     unzip \
     bash \
     clang16-libclang \
-    && mkdir /usr/local/src
+  && mkdir /usr/local/src
 
 # Tell docker to use bash as the default
 SHELL ["/bin/bash", "-c"]
@@ -45,7 +45,7 @@ SHELL ["/bin/bash", "-c"]
 
 FROM alpine_base as alpine_aws_cli
 RUN apk add --no-cache aws-cli \
-    && rm -rf /var/cache/apk/*
+  && rm -rf /var/cache/apk/*
 
 RUN aws --version   # Just to make sure its installed alright