github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant [Serial] tags and dont delete CRD's at the end of test

Browse Source
This commit is contained in:
David Zhu 2018-10-02 14:46:58 -07:00
parent e7af381538
commit fd18fc548d
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/storage/csi_objects.go
View File

@ -535,21 +535,17 @@ func createCSICRDs(c apiextensionsclient.Interface) {
} }
for _, crd := range crds { for _, crd := range crds {
_, err := c.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd) _, err := c.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{})
if err == nil {
continue
} else if !apierrs.IsNotFound(err) {
framework.ExpectNoError(err, "Failed to check for existing of CSI CRD %q: %v", crd.Name, err)
}
_, err = c.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
framework.ExpectNoError(err, "Failed to create CSI CRD %q: %v", crd.Name, err) framework.ExpectNoError(err, "Failed to create CSI CRD %q: %v", crd.Name, err)
} }
} }
func deleteCSICRDs(c apiextensionsclient.Interface) {
By("Deleting CSI CRDs")
csiDriverCRDName := csicrd.CSIDriverCRD().Name
csiNodeInfoCRDName := csicrd.CSINodeInfoCRD().Name
err := c.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(csiDriverCRDName, &metav1.DeleteOptions{})
framework.ExpectNoError(err, "Failed to delete CSI CRD %q: %v", csiDriverCRDName, err)
err = c.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(csiNodeInfoCRDName, &metav1.DeleteOptions{})
framework.ExpectNoError(err, "Failed to delete CSI CRD %q: %v", csiNodeInfoCRDName, err)
}
func shredFile(filePath string) { func shredFile(filePath string) {
if _, err := os.Stat(filePath); os.IsNotExist(err) { if _, err := os.Stat(filePath); os.IsNotExist(err) {
framework.Logf("File %v was not found, skipping shredding", filePath) framework.Logf("File %v was not found, skipping shredding", filePath)

8
test/e2e/storage/csi_volumes.go
View File

@ -58,7 +58,7 @@ var csiTestDrivers = map[string]func(f *framework.Framework, config framework.Vo
"gcePD": initCSIgcePD, "gcePD": initCSIgcePD,
} }
var _ = utils.SIGDescribe("[Serial] CSI Volumes", func() { var _ = utils.SIGDescribe("CSI Volumes", func() {
f := framework.NewDefaultFramework("csi-mock-plugin") f := framework.NewDefaultFramework("csi-mock-plugin")
var ( var (
@ -88,15 +88,11 @@ var _ = utils.SIGDescribe("[Serial] CSI Volumes", func() {
createCSICRDs(crdclient) createCSICRDs(crdclient)
}) })
AfterEach(func() {
deleteCSICRDs(crdclient)
})
for driverName, initCSIDriver := range csiTestDrivers { for driverName, initCSIDriver := range csiTestDrivers {
curDriverName := driverName curDriverName := driverName
curInitCSIDriver := initCSIDriver curInitCSIDriver := initCSIDriver
Context(fmt.Sprintf("CSI plugin test using CSI driver: %s [Serial]", curDriverName), func() { Context(fmt.Sprintf("CSI plugin test using CSI driver: %s", curDriverName), func() {
var ( var (
driver csiTestDriver driver csiTestDriver
) )