patch

signalfx · Mar 20, 2024 · 99fb489 · 99fb489
1 parent 29c1001
commit 99fb489
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -215,6 +215,12 @@ jobs:
         image: quay.io/splunko11ytest/postgres:latest
         ports:
           - "15432:5432"
+      redis_client:
+        image: quay.io/splunko11ytest/redis_client:latest
+      redis_server:
+        image: quay.io/splunko11ytest/redis_server:latest
+        ports:
+          - "6379:6379"
     strategy:
       matrix:
         ARCH: [ "amd64", "arm64" ]

diff --git a/...eceivers/redis/testdata/client/Dockerfile → docker/redis_client/Dockerfile b/...eceivers/redis/testdata/client/Dockerfile → docker/redis_client/Dockerfile
diff --git a/...s/receivers/redis/testdata/client/init.sh → docker/redis_client/init.sh b/...s/receivers/redis/testdata/client/init.sh → docker/redis_client/init.sh
diff --git a/...eceivers/redis/testdata/server/Dockerfile → docker/redis_server/Dockerfile b/...eceivers/redis/testdata/server/Dockerfile → docker/redis_server/Dockerfile
diff --git a/...eceivers/redis/testdata/server/redis.conf → docker/redis_server/redis.conf b/...eceivers/redis/testdata/server/redis.conf → docker/redis_server/redis.conf
diff --git a/tests/receivers/redis/redisreceiver_test.go b/tests/receivers/redis/redisreceiver_test.go
@@ -17,21 +17,15 @@
 package tests
 
 import (
-	"path"
 	"testing"
 
 	"github.com/signalfx/splunk-otel-collector/tests/testutils"
 )
 
 func TestRedisReceiverProvidesAllMetrics(t *testing.T) {
-	server := testutils.NewContainer().WithContext(path.Join(".", "testdata", "server")).WithExposedPorts("6379:6379").WithName("redis-server").WillWaitForPorts("6379").WillWaitForLogs("Ready to accept connections")
-	containers := []testutils.Container{server}
-	testutils.AssertAllMetricsReceived(t, "all.yaml", "all_metrics_config.yaml", containers, nil)
+	testutils.AssertAllMetricsReceived(t, "all.yaml", "all_metrics_config.yaml", nil, nil)
 }
 
 func TestRedisReceiverProvidesAllMetricsWithServer(t *testing.T) {
-	server := testutils.NewContainer().WithContext(path.Join(".", "testdata", "server")).WithExposedPorts("6379:6379").WithNetworks("redis_network").WithName("redis-server").WillWaitForLogs("Ready to accept connections")
-	client := testutils.NewContainer().WithContext(path.Join(".", "testdata", "client")).WithName("redis-client").WithNetworks("redis_network").WillWaitForLogs("redis client started")
-	containers := []testutils.Container{server, client}
-	testutils.AssertAllMetricsReceived(t, "all_server.yaml", "all_metrics_config.yaml", containers, nil)
+	testutils.AssertAllMetricsReceived(t, "all_server.yaml", "all_metrics_config.yaml", nil, nil)
 }