diff --git a/.github/workflows/lint-golang.yaml b/.github/workflows/lint-golang.yaml index dd2cb3e3..d5647c39 100644 --- a/.github/workflows/lint-golang.yaml +++ b/.github/workflows/lint-golang.yaml @@ -212,7 +212,7 @@ jobs: # ============= upload coverage report - name: Upload to Codecov if: ${{ steps.unitest.outcome != 'failure' }} - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v4 with: directory: './' files: 'coverage.out' diff --git a/framework/pod.go b/framework/pod.go index 574b213a..eb945238 100644 --- a/framework/pod.go +++ b/framework/pod.go @@ -370,3 +370,20 @@ func (f *Framework) WaitAllPodUntilRunning(ctx context.Context) error { } } } + +func (f *Framework) DeletePodListByLabel(label map[string]string) error { + if label == nil { + return ErrWrongInput + } + + podList, err := f.GetPodListByLabel(label) + if err != nil { + return err + } + + if len(podList.Items) == 0 { + return nil + } + + return f.DeletePodList(podList) +} diff --git a/framework/pod_test.go b/framework/pod_test.go index 0da40ea9..d2c0b0f9 100644 --- a/framework/pod_test.go +++ b/framework/pod_test.go @@ -259,4 +259,23 @@ var _ = Describe("test pod", Label("pod"), func() { err11 := f.DeletePodUntilFinish(podName, "", ctx4, opts4) Expect(err11).To(HaveOccurred()) }) + + Describe("DeletePodListByLabel", func() { + + It("label is nil", func() { + err := f.DeletePodListByLabel(nil) + Expect(err).To(MatchError(e2e.ErrWrongInput)) + }) + + It("succeed to delete PodList via label", func() { + pod := generateExamplePodYaml(podName, namespace, label, "Running") + + // create pod + err := f.CreatePod(pod) + Expect(err).NotTo(HaveOccurred()) + + err = f.DeletePodListByLabel(label) + Expect(err).NotTo(HaveOccurred()) + }) + }) }) diff --git a/scripts/scripts.go b/scripts/scripts.go index 394d8ea8..59da6db0 100644 --- a/scripts/scripts.go +++ b/scripts/scripts.go @@ -1,7 +1,3 @@ // Copyright 2022 Authors of spidernet-io // SPDX-License-Identifier: Apache-2.0 package scripts - -import ( - _ "github.com/onsi/ginkgo/v2/ginkgo" -)