Merge branch 'main' into optional_isolated_environment

Author: fmoehler

.github/workflows/go.yml

@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-    name: lint
     runs-on: ${{ matrix.os }}
     steps:
       - name: Setup Image
@@ -19,3 +18,18 @@ jobs:
         with:
           go-version-file: go.mod
       - uses: golangci/golangci-lint-action@v6
+  test-unit:
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setup Image
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update && sudo apt-get install -y libpcap-dev
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+      - run: bin/test-unit

.golangci.yml

@@ -1,6 +1,6 @@
 # https://golangci-lint.run/usage/configuration/
 run:
-  timeout: 3m # 1m default times out on github-action runners
+  timeout: 5m # 1m default times out on github-action runners
 
 linters:
   enable:

acceptance/lifecycle_test.go

@@ -4,19 +4,18 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"os"
 	"regexp"
 	"strings"
 	"text/template"
 
-	. "github.com/cloudfoundry/bosh-cli/v7/acceptance"
+	boshlog "github.com/cloudfoundry/bosh-utils/logger"
+	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"os"
-
+	. "github.com/cloudfoundry/bosh-cli/v7/acceptance"
 	bitestutils "github.com/cloudfoundry/bosh-cli/v7/testutils"
-	boshlog "github.com/cloudfoundry/bosh-utils/logger"
-	boshsys "github.com/cloudfoundry/bosh-utils/system"
 )
 
 const (