Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest main #2

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
625d9b1
chore: update client-go to 1.29
nberlee Jun 12, 2024
89f50c8
fix: do not wait for initContainer to exit when it is a sidecar
nberlee Jun 12, 2024
e19ac5f
tests: update golang version
nberlee Jul 10, 2024
bf9d115
chore: refactor exec.Stream to exec.StreamWithContext
nberlee Jul 10, 2024
1e2c02d
chore: refactor wait.Poll* to wait.PollUntilContext
nberlee Jul 10, 2024
6bb85bd
fix: use correct context
lizardruss Jul 30, 2024
73401c7
fix: upgrade github.com/google/go-containerregistry
lizardruss Jul 30, 2024
e9b5461
test: fix terminal test expectation
lizardruss Jul 30, 2024
854407d
test: handle error from stopping command
lizardruss Jul 31, 2024
634509a
Merge pull request #2866 from nberlee/main
lizardruss Jul 31, 2024
8459123
chore(deps): bump golang.org/x/net from 0.7.0 to 0.23.0
dependabot[bot] Jul 31, 2024
b84e5ef
chore: bump setup-go version
lizardruss Jul 31, 2024
e32da3a
chore: set GOROOT for go-licenses
lizardruss Jul 31, 2024
fe3d009
chore: update check licenses path
lizardruss Jul 31, 2024
5fb76a6
chore: update licenses
lizardruss Jul 31, 2024
29b7ae8
Merge pull request #2873 from devspace-sh/bump-setup-go
lizardruss Jul 31, 2024
592ae12
Merge pull request #2842 from devspace-sh/dependabot/go_modules/golan…
lizardruss Jul 31, 2024
a098606
chore(deps): bump ws from 7.5.9 to 7.5.10 in /docs
dependabot[bot] Jul 31, 2024
b7ed003
chore(deps): bump github.com/docker/docker
dependabot[bot] Jul 31, 2024
53a504e
Merge pull request #2875 from devspace-sh/dependabot/npm_and_yarn/doc…
lizardruss Jul 31, 2024
f065ed5
fix: deprecations and compile errors due to docker upgrade
lizardruss Jul 31, 2024
2ce6f60
chore(deps): bump google.golang.org/protobuf from 1.28.1 to 1.33.0
dependabot[bot] Jul 31, 2024
deeda9e
Merge pull request #2876 from devspace-sh/dependabot/go_modules/githu…
lizardruss Jul 31, 2024
b773b9b
Merge pull request #2816 from devspace-sh/dependabot/go_modules/googl…
lizardruss Aug 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: fix terminal test expectation
Signed-off-by: Russell Centanni <russell.centanni@gmail.com>
lizardruss committed Jul 30, 2024
commit e9b546188f9a29f370400cd1fe2713511e9f26e1
16 changes: 13 additions & 3 deletions e2e/tests/terminal/terminal.go
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ import (
"github.com/loft-sh/devspace/pkg/devspace/devpod"
"github.com/loft-sh/devspace/pkg/util/factory"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
@@ -138,9 +139,18 @@ sleep 1000000
})
framework.ExpectNoError(err)

// make sure the pod exists
err = kubeClient.RawClient().CoreV1().Pods(ns).Delete(context.TODO(), podName, metav1.DeleteOptions{})
framework.ExpectNoError(err)
gomega.Eventually(func(g gomega.Gomega) {
// make sure the pod exists
_, err := kubeClient.RawClient().CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())

// delete it
err = kubeClient.RawClient().CoreV1().Pods(ns).Delete(context.TODO(), podName, metav1.DeleteOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
}).
WithPolling(1 * time.Second).
WithTimeout(30 * time.Second).
Should(gomega.Succeed())

// wait until pod is terminated
err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*3, true, func(ctx context.Context) (done bool, err error) {