github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Add unit tests for MountVolume() of operation executor

Browse Source
This commit is contained in:
rkouj 2016-12-21 11:39:47 -08:00
parent d5f7610b82
commit e7e3c55ad7
7 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go
View File

@ -154,10 +154,6 @@ func (grm *nestedPendingOperations) IsOperationPending(
return false return false
} }
func (grm *nestedPendingOperations) GetOperations() []operation {
return grm.operations
}
// This is an internal function and caller should acquire and release the lock // This is an internal function and caller should acquire and release the lock
func (grm *nestedPendingOperations) isOperationExists( func (grm *nestedPendingOperations) isOperationExists(
volumeName v1.UniqueVolumeName, volumeName v1.UniqueVolumeName,

4
pkg/volume/util/operationexecutor/operation_executor.go
View File

@ -469,10 +469,6 @@ func (oe *operationExecutor) VerifyControllerAttachedVolume(
volumeToMount.VolumeName, "" /* podName */, verifyControllerAttachedVolumeFunc) volumeToMount.VolumeName, "" /* podName */, verifyControllerAttachedVolumeFunc)
} }
func (oe *operationExecutor) GetNestedPendingOperations() nestedpendingoperations.NestedPendingOperations {
return oe.pendingOperations
}
// TODO: this is a workaround for the unmount device issue caused by gci mounter. // TODO: this is a workaround for the unmount device issue caused by gci mounter.
// In GCI cluster, if gci mounter is used for mounting, the container started by mounter // In GCI cluster, if gci mounter is used for mounting, the container started by mounter
// script will cause additional mounts created in the container. Since these mounts are // script will cause additional mounts created in the container. Since these mounts are

6
pkg/volume/util/operationexecutor/operation_executor_test.go
View File

@ -54,7 +54,8 @@ func TestOperationExecutor_MountVolume_ParallelMountForNonAttachablePlugins(t *t
} }
// Assert // Assert
loop: for { loop:
for {
select { select {
case <-ch: case <-ch:
numMountOperationsStarted++ numMountOperationsStarted++
@ -93,7 +94,8 @@ func TestOperationExecutor_MountVolume_ParallelMountForAttachablePlugins(t *test
} }
// Assert // Assert
loop: for { loop:
for {
select { select {
case <-ch: case <-ch:
numMountOperationsStarted++ numMountOperationsStarted++