From a5516d55a5d6c3be0a64a6267ae2fff0cc47288c Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Thu, 13 Feb 2025 07:34:57 +0100 Subject: [PATCH] test: separate integration tests --- .github/workflows/ci-build.yml | 6 +++++- container/integration_test.go | 6 ++++-- mediaserver/integration_test.go | 4 +++- mise/config.toml | 12 +++++++++++- multiplexer/integration_test.go | 4 +++- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7590725..b6d0b3f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -38,7 +38,11 @@ jobs: version: v1.64.2 - name: check_gomod run: mise run check_gomod - - name: test_ci + - name: test env: DOCKER_API_VERSION: "1.45" run: mise run test_ci + - name: test_integration + env: + DOCKER_API_VERSION: "1.45" + run: mise run test_integration_ci diff --git a/container/integration_test.go b/container/integration_test.go index 0cb44b6..33bd228 100644 --- a/container/integration_test.go +++ b/container/integration_test.go @@ -1,3 +1,5 @@ +//go:build integration + package container_test import ( @@ -15,7 +17,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestClientStartStop(t *testing.T) { +func TestIntegrationClientStartStop(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) t.Cleanup(cancel) @@ -65,7 +67,7 @@ func TestClientStartStop(t *testing.T) { assert.False(t, running) } -func TestClientRemoveContainers(t *testing.T) { +func TestIntegrationClientRemoveContainers(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) t.Cleanup(cancel) diff --git a/mediaserver/integration_test.go b/mediaserver/integration_test.go index fb75c05..23cb744 100644 --- a/mediaserver/integration_test.go +++ b/mediaserver/integration_test.go @@ -1,3 +1,5 @@ +//go:build integration + package mediaserver_test import ( @@ -14,7 +16,7 @@ import ( const component = "mediaserver" -func TestMediaServerStartStop(t *testing.T) { +func TestIntegrationMediaServerStartStop(t *testing.T) { logger := testhelpers.NewTestLogger() apiClient, err := client.NewClientWithOpts(client.FromEnv) require.NoError(t, err) diff --git a/mise/config.toml b/mise/config.toml index 62d5546..6724ce1 100644 --- a/mise/config.toml +++ b/mise/config.toml @@ -7,11 +7,21 @@ dir = "{{cwd}}" run = "go test -v ./..." alias = "t" +[tasks.test_integration] +description = "Run integration tests" +dir = "{{cwd}}" +run = "go test -v -tags=integration -run TestIntegration ./..." +alias = "ti" + [tasks.test_ci] description = "Run tests in CI" dir = "{{cwd}}" run = "go test -v -race ./..." -alias = "tci" + +[tasks.test_integration_ci] +description = "Run integration tests in CI" +dir = "{{cwd}}" +run = "go test -v -race -tags=integration -run TestIntegration ./..." [tasks.lint] description = "Run linters" diff --git a/multiplexer/integration_test.go b/multiplexer/integration_test.go index 3dea0d9..9978afb 100644 --- a/multiplexer/integration_test.go +++ b/multiplexer/integration_test.go @@ -1,3 +1,5 @@ +//go:build integration + package multiplexer_test import ( @@ -15,7 +17,7 @@ import ( const component = "multiplexer" -func TestMultiplexer(t *testing.T) { +func TestIntegrationMultiplexer(t *testing.T) { logger := testhelpers.NewTestLogger() apiClient, err := client.NewClientWithOpts(client.FromEnv) require.NoError(t, err)