We do not pass device path to unmount device

Also rename attachable-with-long-format file
kubernetes · Dec 3, 2018 · 1570f39 · 1570f39
1 parent c7598e8
commit 1570f39
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/test/e2e/storage/detach_mounted.go b/test/e2e/storage/detach_mounted.go
@@ -64,7 +64,7 @@ var _ = utils.SIGDescribe("Detaching volumes", func() {
 	})
 
 	It("should not work when mount is in progress", func() {
-		driver := "attachable-with-long-format"
+		driver := "attachable-with-long-mount"
 		driverInstallAs := driver + "-" + suffix
 
 		By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driverInstallAs))

diff --git a/...ts/flexvolume/attachable-with-long-format → ...sts/flexvolume/attachable-with-long-mount b/...ts/flexvolume/attachable-with-long-format → ...sts/flexvolume/attachable-with-long-mount
diff --git a/test/e2e/testing-manifests/flexvolume/dummy-attachable b/test/e2e/testing-manifests/flexvolume/dummy-attachable
@@ -81,8 +81,6 @@ domountdevice() {
 
 unmountdevice() {
 	debug "unmountdevice $@"
-	MNTDEVICE=$2
-	validateMountDeviceOrDie "$MNTDEVICE" "unmountdevice"
 	MNTPATH=$1
 	rm "${MNTPATH}/index.html" >/dev/null 2>&1
 	umount ${MNTPATH} >/dev/null 2>&1