NOISSUE - Revert Mosquitto broker version in MQTT tests (#2063)

Signed-off-by: Dusan Borovcanin <[email protected]>

pkg/messaging/mqtt/setup_test.go

@@ -18,6 +18,7 @@ import (
 	mqttpubsub "github.com/absmach/magistrala/pkg/messaging/mqtt"
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
 )
 
 var (
@@ -30,8 +31,6 @@ const (
 	username      = "magistrala-mqtt"
 	qos           = 2
 	port          = "1883/tcp"
-	broker        = "eclipse-mosquitto"
-	brokerVersion = "2.0.18"
 	brokerTimeout = 30 * time.Second
 	poolMaxWait   = 120 * time.Second
 )
@@ -42,7 +41,13 @@ func TestMain(m *testing.M) {
 		log.Fatalf("Could not connect to docker: %s", err)
 	}
 
-	container, err := pool.Run(broker, brokerVersion, nil)
+	container, err := pool.RunWithOptions(&dockertest.RunOptions{
+		Repository: "eclipse-mosquitto",
+		Tag:        "1.6.15",
+	}, func(config *docker.HostConfig) {
+		config.AutoRemove = true
+		config.RestartPolicy = docker.RestartPolicy{Name: "no"}
+	})
 	if err != nil {
 		log.Fatalf("Could not start container: %s", err)
 	}

readers/mongodb/setup_test.go

@@ -27,7 +27,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "mongo",
-		Tag:        "6.0.13",
+		Tag:        "7.0.5",
 		Env: []string{
 			"MONGO_INITDB_DATABASE=test",
 		},

things/cache/setup_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-redis/redis/v8"
 	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
 )
 
 var (
@@ -25,7 +26,13 @@ func TestMain(m *testing.M) {
 		log.Fatalf("Could not connect to docker: %s", err)
 	}
 
-	container, err := pool.Run("redis", "7.2.0-alpine", nil)
+	container, err := pool.RunWithOptions(&dockertest.RunOptions{
+		Repository: "redis",
+		Tag:        "7.2.4-alpine",
+	}, func(config *docker.HostConfig) {
+		config.AutoRemove = true
+		config.RestartPolicy = docker.RestartPolicy{Name: "no"}
+	})
 	if err != nil {
 		log.Fatalf("Could not start container: %s", err)
 	}

twins/events/setup_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-redis/redis/v8"
 	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
 )
 
 var (
@@ -25,7 +26,13 @@ func TestMain(m *testing.M) {
 		log.Fatalf("Could not connect to docker: %s", err)
 	}
 
-	container, err := pool.Run("redis", "7.2.0-alpine", nil)
+	container, err := pool.RunWithOptions(&dockertest.RunOptions{
+		Repository: "redis",
+		Tag:        "7.2.4-alpine",
+	}, func(config *docker.HostConfig) {
+		config.AutoRemove = true
+		config.RestartPolicy = docker.RestartPolicy{Name: "no"}
+	})
 	if err != nil {
 		log.Fatalf("Could not start container: %s", err)
 	}

twins/mongodb/setup_test.go

@@ -6,10 +6,12 @@ package mongodb_test
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"testing"
 
 	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
@@ -22,13 +24,16 @@ func TestMain(m *testing.M) {
 		testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
 	}
 
-	cfg := []string{
-		"MONGO_INITDB_DATABASE=test",
-	}
-
-	container, err := pool.Run("mongo", "7.0.5", cfg)
+	container, err := pool.RunWithOptions(&dockertest.RunOptions{
+		Repository: "mongo",
+		Tag:        "7.0.5",
+		Env:        []string{"MONGO_INITDB_DATABASE=test"},
+	}, func(config *docker.HostConfig) {
+		config.AutoRemove = true
+		config.RestartPolicy = docker.RestartPolicy{Name: "no"}
+	})
 	if err != nil {
-		testLog.Error(fmt.Sprintf("Could not start container: %s", err))
+		log.Fatalf("Could not start container: %s", err)
 	}
 
 	port = container.GetPort("27017/tcp")