fix: automated tests (#6300)

* chore: delete broken license test
* fix: avoid running k6 tests in parallel (as they create API server at 6565 each)
* fix: add check thresholds to failing test
* fix: logs tests

Author: rangoo94

contrib/executor/k6/examples/k6-test-failing-script.js

@@ -1,6 +1,12 @@
 import http from 'k6/http';
 import { check } from 'k6';
 
+export let options = {
+  thresholds: {
+    checks: ['rate>0.5'],
+  },
+};
+
 export default function () {
   const baseURI = `${__ENV.API_URI || 'http://google.pl'}`;
 

contrib/executor/k6/pkg/runner/runner_integration_test.go

@@ -20,8 +20,6 @@ func TestRunFiles_Integration(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("Run k6 with simple script", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -53,8 +51,6 @@ func TestRunFiles_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 with simple failing script", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -86,8 +82,6 @@ func TestRunFiles_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 with arguments and simple script", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -123,8 +117,6 @@ func TestRunFiles_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 with ENV variables and script", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -159,7 +151,6 @@ func TestRunFiles_Integration(t *testing.T) {
 
 func TestRunAdvanced_Integration(t *testing.T) {
 	test.IntegrationTest(t)
-	t.Parallel()
 
 	ctx := context.Background()
 
@@ -197,8 +188,6 @@ func TestRunAdvanced_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 with checks and thresholds", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -233,7 +222,6 @@ func TestRunAdvanced_Integration(t *testing.T) {
 
 func TestRunDirs_Integtaion(t *testing.T) {
 	test.IntegrationTest(t)
-	t.Parallel()
 
 	ctx := context.Background()
 	// setup
@@ -292,7 +280,6 @@ func TestRunDirs_Integtaion(t *testing.T) {
 
 func TestRunErrors_Integration(t *testing.T) {
 	test.IntegrationTest(t)
-	t.Parallel()
 
 	ctx := context.Background()
 
@@ -329,8 +316,6 @@ func TestRunErrors_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 with invalid arguments", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)
@@ -365,8 +350,6 @@ func TestRunErrors_Integration(t *testing.T) {
 	})
 
 	t.Run("Run k6 from directory with missing script arg", func(t *testing.T) {
-		t.Parallel()
-
 		tempDir, err := os.MkdirTemp("", "*")
 		assert.NoErrorf(t, err, "failed to create temp dir: %v", err)
 		defer os.RemoveAll(tempDir)

pkg/diagnostics/validators/license/client_test.go

@@ -50,20 +50,4 @@ func TestValidateLicense(t *testing.T) {
 		assert.NoError(t, err)
 		assert.False(t, resp.Valid)
 	})
-
-	t.Run("RealValidation license valid", func(t *testing.T) {
-		client := NewClient()
-
-		response, err := client.ValidateLicense(LicenseRequest{License: "AB24F3-405E39-C3F657-94D113-F06C13-V3"})
-		if err != nil {
-			t.Fatalf("Expected no error, got %v", err)
-		}
-
-		if !response.Valid {
-			t.Errorf("Expected license to be valid, got %v", response.Valid)
-		}
-		if response.Code != "VALID" {
-			t.Errorf("Expected message 'VALID', got %s", response.Code)
-		}
-	})
 }

pkg/logs/events_test.go

@@ -256,6 +256,11 @@ func TestLogs_EventsFlow(t *testing.T) {
 		// cool down
 		time.Sleep(waitTime)
 
+		// cool down another time, if there is still something awaiting
+		if left, _ := nc.Buffered(); left > 0 {
+			time.Sleep(waitTime)
+		}
+
 		// then each adapter should receive messages
 		assertMessagesCount(t, a1, messagesCount)
 		assertMessagesCount(t, a2, messagesCount)

pkg/logs/service.go

@@ -9,7 +9,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"math/rand"
 	"net"
 	"net/http"
 	"os"
@@ -37,6 +36,19 @@ const (
 	defaultStopPauseInterval = 200 * time.Millisecond
 )
 
+func GetFreePort() int {
+	var a *net.TCPAddr
+	var err error
+	if a, err = net.ResolveTCPAddr("tcp", ":0"); err == nil {
+		var l *net.TCPListener
+		if l, err = net.ListenTCP("tcp", a); err == nil {
+			defer l.Close()
+			return l.Addr().(*net.TCPAddr).Port
+		}
+	}
+	panic(err)
+}
+
 func NewLogsService(nats *nats.Conn, js jetstream.JetStream, state state.Interface, stream client.Stream) *LogsService {
 	return &LogsService{
 		nats:              nats,
@@ -187,10 +199,8 @@ func (ls *LogsService) WithPauseInterval(duration time.Duration) *LogsService {
 }
 
 func (ls *LogsService) WithRandomPort() *LogsService {
-	port := rand.Intn(1000) + 17000
-	ls.httpAddress = fmt.Sprintf("127.0.0.1:%d", port)
-	port = rand.Intn(1000) + 18000
-	ls.grpcAddress = fmt.Sprintf("127.0.0.1:%d", port)
+	ls.httpAddress = fmt.Sprintf("127.0.0.1:%d", GetFreePort())
+	ls.grpcAddress = fmt.Sprintf("127.0.0.1:%d", GetFreePort())
 	return ls
 }