From f9bee5f54f254552563d0fb237b50a124204f1ea Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Fri, 4 Apr 2025 14:43:35 +0200 Subject: [PATCH] rename high-level tests into E2E tests (#4395) --- .github/workflows/code_test.yml | 4 ++-- Makefile | 2 +- .../build_images_test.go | 4 ++-- .../hls_manager_test.go | 4 ++-- .../images/ffmpeg/Dockerfile | 0 .../images/ffmpeg/emptyvideo.mkv | Bin .../images/ffmpeg/emptyvideoaudio.mkv | Bin .../images/ffmpeg/start.sh | 0 .../images/gstreamer/Dockerfile | 0 .../images/gstreamer/emptyvideo.mkv | Bin .../images/gstreamer/exitafterframe.c | 0 .../images/gstreamer/start.sh | 0 .../images/vlc/Dockerfile | 0 .../images/vlc/start.sh | 0 .../rtsp_server_test.go | 4 ++-- .../{testhighlevel => teste2e}/tests_test.go | 4 ++-- scripts/test-e2e.mk | 21 ++++++++++++++++++ scripts/test-highlevel.mk | 21 ------------------ 18 files changed, 32 insertions(+), 32 deletions(-) rename internal/{testhighlevel => teste2e}/build_images_test.go (89%) rename internal/{testhighlevel => teste2e}/hls_manager_test.go (97%) rename internal/{testhighlevel => teste2e}/images/ffmpeg/Dockerfile (100%) rename internal/{testhighlevel => teste2e}/images/ffmpeg/emptyvideo.mkv (100%) rename internal/{testhighlevel => teste2e}/images/ffmpeg/emptyvideoaudio.mkv (100%) rename internal/{testhighlevel => teste2e}/images/ffmpeg/start.sh (100%) rename internal/{testhighlevel => teste2e}/images/gstreamer/Dockerfile (100%) rename internal/{testhighlevel => teste2e}/images/gstreamer/emptyvideo.mkv (100%) rename internal/{testhighlevel => teste2e}/images/gstreamer/exitafterframe.c (100%) rename internal/{testhighlevel => teste2e}/images/gstreamer/start.sh (100%) rename internal/{testhighlevel => teste2e}/images/vlc/Dockerfile (100%) rename internal/{testhighlevel => teste2e}/images/vlc/start.sh (100%) rename internal/{testhighlevel => teste2e}/rtsp_server_test.go (99%) rename internal/{testhighlevel => teste2e}/tests_test.go (96%) create mode 100644 scripts/test-e2e.mk delete mode 100644 scripts/test-highlevel.mk diff --git a/.github/workflows/code_test.yml b/.github/workflows/code_test.yml index 32918d71..91a563d9 100644 --- a/.github/workflows/code_test.yml +++ b/.github/workflows/code_test.yml @@ -31,7 +31,7 @@ jobs: - run: make test32 - test_highlevel: + test_e2e: runs-on: ubuntu-22.04 steps: @@ -43,4 +43,4 @@ jobs: with: go-version: "1.23" - - run: make test-highlevel-nodocker + - run: make test-e2e-nodocker diff --git a/Makefile b/Makefile index e39b1721..9f09f71d 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ help: @echo " format format source files" @echo " test run tests" @echo " test32 run tests on a 32-bit system" - @echo " test-highlevel run high-level tests" + @echo " test-e2e run end-to-end tests" @echo " lint run linters" @echo " run run app" @echo " apidocs generate api docs HTML" diff --git a/internal/testhighlevel/build_images_test.go b/internal/teste2e/build_images_test.go similarity index 89% rename from internal/testhighlevel/build_images_test.go rename to internal/teste2e/build_images_test.go index f8e1cafe..2dc96396 100644 --- a/internal/testhighlevel/build_images_test.go +++ b/internal/teste2e/build_images_test.go @@ -1,6 +1,6 @@ -//go:build enable_highlevel_tests +//go:build enable_e2e_tests -package testhighlevel +package teste2e import ( "os" diff --git a/internal/testhighlevel/hls_manager_test.go b/internal/teste2e/hls_manager_test.go similarity index 97% rename from internal/testhighlevel/hls_manager_test.go rename to internal/teste2e/hls_manager_test.go index 402735a1..58e5c4a3 100644 --- a/internal/testhighlevel/hls_manager_test.go +++ b/internal/teste2e/hls_manager_test.go @@ -1,6 +1,6 @@ -//go:build enable_highlevel_tests +//go:build enable_e2e_tests -package testhighlevel +package teste2e import ( "net/http" diff --git a/internal/testhighlevel/images/ffmpeg/Dockerfile b/internal/teste2e/images/ffmpeg/Dockerfile similarity index 100% rename from internal/testhighlevel/images/ffmpeg/Dockerfile rename to internal/teste2e/images/ffmpeg/Dockerfile diff --git a/internal/testhighlevel/images/ffmpeg/emptyvideo.mkv b/internal/teste2e/images/ffmpeg/emptyvideo.mkv similarity index 100% rename from internal/testhighlevel/images/ffmpeg/emptyvideo.mkv rename to internal/teste2e/images/ffmpeg/emptyvideo.mkv diff --git a/internal/testhighlevel/images/ffmpeg/emptyvideoaudio.mkv b/internal/teste2e/images/ffmpeg/emptyvideoaudio.mkv similarity index 100% rename from internal/testhighlevel/images/ffmpeg/emptyvideoaudio.mkv rename to internal/teste2e/images/ffmpeg/emptyvideoaudio.mkv diff --git a/internal/testhighlevel/images/ffmpeg/start.sh b/internal/teste2e/images/ffmpeg/start.sh similarity index 100% rename from internal/testhighlevel/images/ffmpeg/start.sh rename to internal/teste2e/images/ffmpeg/start.sh diff --git a/internal/testhighlevel/images/gstreamer/Dockerfile b/internal/teste2e/images/gstreamer/Dockerfile similarity index 100% rename from internal/testhighlevel/images/gstreamer/Dockerfile rename to internal/teste2e/images/gstreamer/Dockerfile diff --git a/internal/testhighlevel/images/gstreamer/emptyvideo.mkv b/internal/teste2e/images/gstreamer/emptyvideo.mkv similarity index 100% rename from internal/testhighlevel/images/gstreamer/emptyvideo.mkv rename to internal/teste2e/images/gstreamer/emptyvideo.mkv diff --git a/internal/testhighlevel/images/gstreamer/exitafterframe.c b/internal/teste2e/images/gstreamer/exitafterframe.c similarity index 100% rename from internal/testhighlevel/images/gstreamer/exitafterframe.c rename to internal/teste2e/images/gstreamer/exitafterframe.c diff --git a/internal/testhighlevel/images/gstreamer/start.sh b/internal/teste2e/images/gstreamer/start.sh similarity index 100% rename from internal/testhighlevel/images/gstreamer/start.sh rename to internal/teste2e/images/gstreamer/start.sh diff --git a/internal/testhighlevel/images/vlc/Dockerfile b/internal/teste2e/images/vlc/Dockerfile similarity index 100% rename from internal/testhighlevel/images/vlc/Dockerfile rename to internal/teste2e/images/vlc/Dockerfile diff --git a/internal/testhighlevel/images/vlc/start.sh b/internal/teste2e/images/vlc/start.sh similarity index 100% rename from internal/testhighlevel/images/vlc/start.sh rename to internal/teste2e/images/vlc/start.sh diff --git a/internal/testhighlevel/rtsp_server_test.go b/internal/teste2e/rtsp_server_test.go similarity index 99% rename from internal/testhighlevel/rtsp_server_test.go rename to internal/teste2e/rtsp_server_test.go index a6bb8e5e..fbfed7de 100644 --- a/internal/testhighlevel/rtsp_server_test.go +++ b/internal/teste2e/rtsp_server_test.go @@ -1,6 +1,6 @@ -//go:build enable_highlevel_tests +//go:build enable_e2e_tests -package testhighlevel +package teste2e import ( "os" diff --git a/internal/testhighlevel/tests_test.go b/internal/teste2e/tests_test.go similarity index 96% rename from internal/testhighlevel/tests_test.go rename to internal/teste2e/tests_test.go index 0ed216da..5d553443 100644 --- a/internal/testhighlevel/tests_test.go +++ b/internal/teste2e/tests_test.go @@ -1,6 +1,6 @@ -//go:build enable_highlevel_tests +//go:build enable_e2e_tests -package testhighlevel +package teste2e import ( "os" diff --git a/scripts/test-e2e.mk b/scripts/test-e2e.mk new file mode 100644 index 00000000..66d702f1 --- /dev/null +++ b/scripts/test-e2e.mk @@ -0,0 +1,21 @@ +test-e2e-nodocker: + go generate ./... + go test -v -race -tags enable_e2e_tests ./internal/teste2e + +define DOCKERFILE_E2E_TEST +FROM $(BASE_IMAGE) +RUN apk add --no-cache make docker-cli gcc musl-dev +WORKDIR /s +COPY go.mod go.sum ./ +RUN go mod download +COPY . ./ +endef +export DOCKERFILE_E2E_TEST + +test-e2e: + echo "$$DOCKERFILE_E2E_TEST" | docker build -q . -f - -t temp + docker run --rm -it \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + --network=host \ + temp \ + make test-e2e-nodocker diff --git a/scripts/test-highlevel.mk b/scripts/test-highlevel.mk deleted file mode 100644 index 173092a0..00000000 --- a/scripts/test-highlevel.mk +++ /dev/null @@ -1,21 +0,0 @@ -test-highlevel-nodocker: - go generate ./... - go test -v -race -tags enable_highlevel_tests ./internal/testhighlevel - -define DOCKERFILE_HIGHLEVEL_TEST -FROM $(BASE_IMAGE) -RUN apk add --no-cache make docker-cli gcc musl-dev -WORKDIR /s -COPY go.mod go.sum ./ -RUN go mod download -COPY . ./ -endef -export DOCKERFILE_HIGHLEVEL_TEST - -test-highlevel: - echo "$$DOCKERFILE_HIGHLEVEL_TEST" | docker build -q . -f - -t temp - docker run --rm -it \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - --network=host \ - temp \ - make test-highlevel-nodocker