Update ginkgo to v2 (#166)

cloudfoundry · Mar 18, 2024 · 7f9aa3d · 7f9aa3d
1 parent 9dbdb1a
commit 7f9aa3d
Show file tree

Hide file tree

Showing 57 changed files with 57 additions and 2,414 deletions.
diff --git a/scripts/bosh-lite-acceptance-test b/scripts/bosh-lite-acceptance-test
@@ -32,7 +32,7 @@ AGENT_HOST="$(bosh vms | grep running | grep bpm | awk '{print $4}')"
 agent_port=1337
 
 pushd "${RELEASE_PATH}/src/bpm/acceptance" > /dev/null
-  go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
+  go run github.com/onsi/ginkgo/v2/ginkgo -r -p --race --randomize-all -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
 popd > /dev/null
 
 # We run the errand twice to make sure there is no state left on the VM which

diff --git a/scripts/test-acceptance b/scripts/test-acceptance
@@ -28,5 +28,5 @@ AGENT_HOST="$(bosh -d bpm instances | grep running | awk '{ print $4 }')"
 agent_port=1337
 
 pushd "${RELEASE_PATH}/src/bpm/acceptance" > /dev/null
-  go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
+  go run github.com/onsi/ginkgo/v2/ginkgo -r -p --race --randomize-all -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
 popd > /dev/null
diff --git a/scripts/test-unit b/scripts/test-unit
@@ -5,5 +5,5 @@ RELEASE_PATH="$(cd "$(dirname "$0")/.." && pwd)"
 export RELEASE_PATH
 
 pushd "${RELEASE_PATH}/src/bpm" > /dev/null
-  go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -skipPackage "acceptance" "$@"
+  go run github.com/onsi/ginkgo/v2/ginkgo -r -p --race --randomize-all --skip-package "acceptance" "$@"
 popd
diff --git a/scripts/test-upgrade b/scripts/test-upgrade
@@ -39,5 +39,5 @@ AGENT_HOST="$(bosh -d bpm instances | grep running | awk '{ print $4 }')"
 agent_port=1337
 
 pushd "${RELEASE_PATH}/src/bpm/acceptance" > /dev/null
-  go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
+  go run github.com/onsi/ginkgo/v2/ginkgo -r -p --race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
 popd > /dev/null
diff --git a/src/bpm/acceptance/bpm_acceptance_suite_test.go b/src/bpm/acceptance/bpm_acceptance_suite_test.go
@@ -18,12 +18,11 @@ package bpm_acceptance_test
 import (
 	"flag"
 	"net/http"
+	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 var (

diff --git a/src/bpm/acceptance/bpm_acceptance_test.go b/src/bpm/acceptance/bpm_acceptance_test.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/bosh/bosh_suite_test.go b/src/bpm/bosh/bosh_suite_test.go
@@ -18,7 +18,7 @@ package bosh_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/bosh/env_test.go b/src/bpm/bosh/env_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/bosh"

diff --git a/src/bpm/bosh/paths_test.go b/src/bpm/bosh/paths_test.go
@@ -15,7 +15,7 @@
 package bosh_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/bosh"

diff --git a/src/bpm/cgroups/cgroup_test.go b/src/bpm/cgroups/cgroup_test.go
@@ -19,7 +19,7 @@ import (
 	"io"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/cgroups/cgroups_suite_test.go b/src/bpm/cgroups/cgroups_suite_test.go
@@ -18,7 +18,7 @@ package cgroups
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/config/bpm_config_test.go b/src/bpm/config/bpm_config_test.go
@@ -16,7 +16,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/bosh"

diff --git a/src/bpm/config/config_suite_test.go b/src/bpm/config/config_suite_test.go
@@ -16,7 +16,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/src/bpm/config/job_config_test.go b/src/bpm/config/job_config_test.go
@@ -16,7 +16,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/bosh"

diff --git a/src/bpm/exitstatus/error_test.go b/src/bpm/exitstatus/error_test.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/exitstatus"

diff --git a/src/bpm/flock/flock_suite_test.go b/src/bpm/flock/flock_suite_test.go
@@ -18,7 +18,7 @@ package flock_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/flock/flock_test.go b/src/bpm/flock/flock_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/flock"

diff --git a/src/bpm/hostlock/hostlock_suite_test.go b/src/bpm/hostlock/hostlock_suite_test.go
@@ -18,7 +18,7 @@ package hostlock_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/hostlock/hostlock_test.go b/src/bpm/hostlock/hostlock_test.go
@@ -18,7 +18,7 @@ package hostlock_test
 import (
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"bpm/hostlock"

diff --git a/src/bpm/integration/capabilities_test.go b/src/bpm/integration/capabilities_test.go
@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	uuid "github.com/satori/go.uuid"

diff --git a/src/bpm/integration/integration_suite_test.go b/src/bpm/integration/integration_suite_test.go
@@ -26,11 +26,11 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	yaml "gopkg.in/yaml.v3"
+	"github.com/opencontainers/runtime-spec/specs-go"
+	"gopkg.in/yaml.v3"
 
 	"bpm/config"
 )

diff --git a/src/bpm/integration/integration_test.go b/src/bpm/integration/integration_test.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/src/bpm/integration/list_test.go b/src/bpm/integration/list_test.go
@@ -21,14 +21,13 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	uuid "github.com/satori/go.uuid"
 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-
 	"bpm/config"
 	"bpm/jobid"
 	"bpm/models"

diff --git a/src/bpm/integration/logs_test.go b/src/bpm/integration/logs_test.go
@@ -21,7 +21,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/src/bpm/integration/namespaces_test.go b/src/bpm/integration/namespaces_test.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	uuid "github.com/satori/go.uuid"

diff --git a/src/bpm/integration/pid_test.go b/src/bpm/integration/pid_test.go
@@ -21,11 +21,11 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	uuid "github.com/satori/go.uuid"
 
 	"bpm/config"

diff --git a/src/bpm/integration/privileged_test.go b/src/bpm/integration/privileged_test.go
@@ -21,7 +21,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	uuid "github.com/satori/go.uuid"

diff --git a/src/bpm/integration/resource_limits_test.go b/src/bpm/integration/resource_limits_test.go
@@ -24,10 +24,10 @@ import (
 	"path/filepath"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	uuid "github.com/satori/go.uuid"
 
 	"bpm/bosh"

diff --git a/src/bpm/integration/shell_test.go b/src/bpm/integration/shell_test.go
@@ -23,7 +23,7 @@ import (
 	"syscall"
 
 	"github.com/kr/pty"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/src/bpm/integration/start_test.go b/src/bpm/integration/start_test.go
@@ -23,11 +23,11 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	uuid "github.com/satori/go.uuid"
 
 	"bpm/bosh"

diff --git a/src/bpm/integration/stop_test.go b/src/bpm/integration/stop_test.go
@@ -21,14 +21,13 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"bpm/bosh"
-
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 	uuid "github.com/satori/go.uuid"
 
+	"bpm/bosh"
 	"bpm/config"
 	"bpm/jobid"
 )

diff --git a/src/bpm/integration/trace_test.go b/src/bpm/integration/trace_test.go
@@ -21,11 +21,11 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	uuid "github.com/satori/go.uuid"
 
 	"bpm/config"

diff --git a/src/bpm/integration/version_test.go b/src/bpm/integration/version_test.go
@@ -18,7 +18,7 @@ package integration_test
 import (
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/src/bpm/jobid/encoding_test.go b/src/bpm/jobid/encoding_test.go
@@ -20,8 +20,7 @@ import (
 	"regexp"
 	"testing/quick"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/opencontainers/runc/libcontainer/utils"

diff --git a/src/bpm/jobid/jobid_suite_test.go b/src/bpm/jobid/jobid_suite_test.go
@@ -18,7 +18,7 @@ package jobid_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/license_test.go b/src/bpm/license_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/src/bpm/presenters/presenters_suite_test.go b/src/bpm/presenters/presenters_suite_test.go
@@ -16,7 +16,7 @@
 package presenters_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/src/bpm/presenters/presenters_test.go b/src/bpm/presenters/presenters_test.go
@@ -18,7 +18,7 @@ package presenters_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 

diff --git a/src/bpm/runc/client/client_suite_test.go b/src/bpm/runc/client/client_suite_test.go
@@ -16,10 +16,10 @@
 package client_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 func TestClient(t *testing.T) {