From 664d43e34898106d4ddb40376e4b934154fb475f Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Thu, 30 Jun 2022 23:20:24 +0200 Subject: [PATCH] Add disabling tag no_docker to some go tests --- programs/diagnostics/Makefile | 3 +++ programs/diagnostics/internal/platform/database/native_test.go | 2 ++ programs/diagnostics/internal/platform/manager_test.go | 2 ++ programs/diagnostics/internal/platform/utils/process_test.go | 2 ++ programs/diagnostics/internal/runner_test.go | 2 ++ 5 files changed, 11 insertions(+) diff --git a/programs/diagnostics/Makefile b/programs/diagnostics/Makefile index 0a12630ca6d..2e85002b871 100644 --- a/programs/diagnostics/Makefile +++ b/programs/diagnostics/Makefile @@ -40,6 +40,9 @@ vendor: ## Copy of all packages needed to support builds and tests in the vendor test: ## Run the tests of the project CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race `go list ./... | grep -v ./internal/platform/test` +test-no-docker: ## Don't run tests depending on dockerd + CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race -tags no_docker `go list ./... | grep -v ./internal/platform/test` + lint-go: ## Use golintci-lint docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:latest-alpine golangci-lint run diff --git a/programs/diagnostics/internal/platform/database/native_test.go b/programs/diagnostics/internal/platform/database/native_test.go index 8c317ab7f12..4814310f182 100644 --- a/programs/diagnostics/internal/platform/database/native_test.go +++ b/programs/diagnostics/internal/platform/database/native_test.go @@ -1,3 +1,5 @@ +//go:build !no_docker + package database_test import ( diff --git a/programs/diagnostics/internal/platform/manager_test.go b/programs/diagnostics/internal/platform/manager_test.go index e63ec6af6a7..49efee49ce3 100644 --- a/programs/diagnostics/internal/platform/manager_test.go +++ b/programs/diagnostics/internal/platform/manager_test.go @@ -1,3 +1,5 @@ +//go:build !no_docker + package platform_test import ( diff --git a/programs/diagnostics/internal/platform/utils/process_test.go b/programs/diagnostics/internal/platform/utils/process_test.go index 0c7541f4abb..ed54d16cc72 100644 --- a/programs/diagnostics/internal/platform/utils/process_test.go +++ b/programs/diagnostics/internal/platform/utils/process_test.go @@ -1,3 +1,5 @@ +//go:build !no_docker + package utils_test import ( diff --git a/programs/diagnostics/internal/runner_test.go b/programs/diagnostics/internal/runner_test.go index 81fe9b70a2b..8cf29a140ec 100644 --- a/programs/diagnostics/internal/runner_test.go +++ b/programs/diagnostics/internal/runner_test.go @@ -1,3 +1,5 @@ +//go:build !no_docker + package internal_test import (