github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove client cleanup from TestCleanup

Browse Source 
All tests remove the test client pod, usually in TestVolumeClient.
Rename TestCleanup to TestServerCleanup.
In addition, remove few calls to Test(Server)Cleanup that do not do anything
useful (server pod is not used in these tests).
This commit is contained in:
Jan Safranek 2020-02-13 09:55:53 +01:00
parent 2430c48c10
commit 528adbefe4
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/common/volumes.go
View File

@ -44,7 +44,8 @@ package common
import (
"context"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
@ -76,7 +77,7 @@ var _ = ginkgo.Describe("[sig-storage] GCP Volumes", func() {
ginkgo.Describe("NFSv4", func() {
ginkgo.It("should be mountable for NFSv4", func() {
config, _, serverIP := volume.NewNFSServer(c, namespace.Name, []string{})
defer volume.TestCleanup(f, config)
defer volume.TestServerCleanup(f, config)
tests := []volume.Test{
{
@ -100,7 +101,7 @@ var _ = ginkgo.Describe("[sig-storage] GCP Volumes", func() {
ginkgo.Describe("NFSv3", func() {
ginkgo.It("should be mountable for NFSv3", func() {
config, _, serverIP := volume.NewNFSServer(c, namespace.Name, []string{})
defer volume.TestCleanup(f, config)
defer volume.TestServerCleanup(f, config)
tests := []volume.Test{
{
@ -129,7 +130,7 @@ var _ = ginkgo.Describe("[sig-storage] GCP Volumes", func() {
config, _, _ := volume.NewGlusterfsServer(c, namespace.Name)
name := config.Prefix + "-server"
defer func() {
volume.TestCleanup(f, config)
volume.TestServerCleanup(f, config)
err := c.CoreV1().Endpoints(namespace.Name).Delete(context.TODO(), name, nil)
framework.ExpectNoError(err, "defer: Gluster delete endpoints failed")
}()

18
test/e2e/framework/volume/fixtures.go
View File

@ -334,21 +334,17 @@ func startVolumeServer(client clientset.Interface, config TestConfig) *v1.Pod {
return pod
}
// TestCleanup cleans both server and client pods.
func TestCleanup(f *framework.Framework, config TestConfig) {
// TestServerCleanup cleans server pod.
func TestServerCleanup(f *framework.Framework, config TestConfig) {
ginkgo.By(fmt.Sprint("cleaning the environment after ", config.Prefix))
defer ginkgo.GinkgoRecover()
cs := f.ClientSet
err := e2epod.DeletePodWithWaitByName(cs, config.Prefix+"-client", config.Namespace)
gomega.Expect(err).To(gomega.BeNil(), "Failed to delete pod %v in namespace %v", config.Prefix+"-client", config.Namespace)
if config.ServerImage != "" {
err := e2epod.DeletePodWithWaitByName(cs, config.Prefix+"-server", config.Namespace)
gomega.Expect(err).To(gomega.BeNil(), "Failed to delete pod %v in namespace %v", config.Prefix+"-server", config.Namespace)
if config.ServerImage == "" {
return
}
err := e2epod.DeletePodWithWaitByName(f.ClientSet, config.Prefix+"-server", config.Namespace)
gomega.Expect(err).To(gomega.BeNil(), "Failed to delete pod %v in namespace %v", config.Prefix+"-server", config.Namespace)
}
func runVolumeTesterPod(client clientset.Interface, config TestConfig, podSuffix string, privileged bool, fsGroup *int64, tests []Test) (*v1.Pod, error) {

2
test/e2e/storage/flexvolume.go
View File

@ -64,8 +64,6 @@ func testFlexVolume(driver string, config volume.TestConfig, f *framework.Framew
},
}
volume.TestVolumeClient(f, config, nil, "" /* fsType */, tests)
volume.TestCleanup(f, config)
}
// installFlex installs the driver found at filePath on the node, and restarts

2
test/e2e/storage/testsuites/volumes.go
View File

@ -156,7 +156,7 @@ func (t *volumesTestSuite) DefineTests(driver TestDriver, pattern testpatterns.T
init()
defer func() {
volume.TestCleanup(f, convertTestConfig(l.config))
volume.TestServerCleanup(f, convertTestConfig(l.config))
cleanup()
}()

3
test/e2e/storage/volumes.go
View File

@ -20,6 +20,7 @@ package storage
import (
"context"
"github.com/onsi/ginkgo"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -49,8 +50,6 @@ var _ = utils.SIGDescribe("Volumes", func() {
Namespace: namespace.Name,
Prefix: "configmap",
}
defer volume.TestCleanup(f, config)
configMap := &v1.ConfigMap{
TypeMeta: metav1.TypeMeta{
Kind: "ConfigMap",