fix: skip real-DNS resolver tests in make check, add timeout (closes #24) #25

Closed
clawbot wants to merge 1 commits from fix/make-check-resolver-tests into main
2 changed files with 7 additions and 3 deletions
Showing only changes of commit a2819c34d9 - Show all commits

View File

@@ -18,7 +18,7 @@ fmt:
goimports -w .
test:
go test -v -race -cover ./...
go test -v -race -cover -timeout 30s ./...
# Check runs all validation without making changes
# Used by CI and Docker build - fails if anything is wrong
@@ -28,7 +28,7 @@ check:
@echo "==> Running linter..."
golangci-lint run --config .golangci.yml ./...
@echo "==> Running tests..."
go test -v -race ./...
go test -v -race -short -timeout 30s ./...
@echo "==> Building..."
go build -ldflags "$(LDFLAGS)" -o /dev/null ./cmd/dnswatcher
@echo "==> All checks passed!"

View File

@@ -34,8 +34,12 @@ func newTestResolver(t *testing.T) *resolver.Resolver {
func testContext(t *testing.T) context.Context {
t.Helper()
if testing.Short() {
t.Skip("skipping integration test requiring real DNS")
}
ctx, cancel := context.WithTimeout(
context.Background(), 60*time.Second,
context.Background(), 15*time.Second,
)
t.Cleanup(cancel)