From 2ace743fdf118fafc289514d26c28762792082d3 Mon Sep 17 00:00:00 2001
From: Gabriel de Quadros Ligneul <gligneul@offchainlabs.com>
Date: Thu, 21 Nov 2024 18:32:06 -0300
Subject: [PATCH] Fix docker tests in CI

---
 .ci/build_and_test.sh | 12 ++++++------
 main/Cargo.toml       |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.ci/build_and_test.sh b/.ci/build_and_test.sh
index 67f2378..404589f 100755
--- a/.ci/build_and_test.sh
+++ b/.ci/build_and_test.sh
@@ -16,10 +16,10 @@ else
     cargo build --locked
 fi
 
-UNAME=$(uname -s)
-if [ "$UNAME" == "Darwin" ]; then
-    # Disable docker tests on MacOS CI
-    cargo test --no-default-features
-else
-    cargo test
+cargo test
+
+if [ "$(uname -s)" != "Darwin" ]; then
+    # The MacOS CI doesn't support Docker because of licensing issues, so only run them on Linux.
+    # Also, run the docker tests on a single thread to avoid concurrency issues.
+    cargo test -F docker-test -- --test-threads 1 docker
 fi
diff --git a/main/Cargo.toml b/main/Cargo.toml
index d146957..d09fc9b 100644
--- a/main/Cargo.toml
+++ b/main/Cargo.toml
@@ -11,7 +11,6 @@ version.workspace = true
 repository.workspace = true
 
 [features]
-default = ["docker-test"]
 docker-test = []
 nightly = []