added func to create recyclers for easier testing. fixed unit test w/…

… recycler additions
kubernetes · May 22, 2015 · 105f92d · 105f92d
1 parent 9ad7ea3
commit 105f92d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go
@@ -80,7 +80,7 @@ func (plugin *hostPathPlugin) NewRecycler(spec *volume.Spec) (volume.Recycler, e
 	return plugin.newRecyclerFunc(spec, plugin.host)
 }
 
-func newRecycler(spec *volume.Spec, host volume.VolumeHost)(volume.Recycler, error){
+func newRecycler(spec *volume.Spec, host volume.VolumeHost) (volume.Recycler, error) {
 	if spec.VolumeSource.HostPath != nil {
 		return &hostPathRecycler{spec.VolumeSource.HostPath.Path, host}, nil
 	} else {
@@ -139,7 +139,7 @@ func (hp *hostPathRecycler) Recycle() error {
 		2. use host.client to save to API and watch it
 		3. if pod errors or times out, return error
 		   if pod exits, return nil for success
-	 */
+	*/
 
 	return nil
 }
diff --git a/pkg/volume/host_path/host_path_test.go b/pkg/volume/host_path/host_path_test.go
@@ -60,7 +60,7 @@ func TestRecycler(t *testing.T) {
 	plugMgr := volume.VolumePluginMgr{}
 	plugMgr.InitPlugins([]volume.VolumePlugin{&hostPathPlugin{nil, newMockRecycler}}, volume.NewFakeVolumeHost("/tmp/fake", nil, nil))
 
-	spec := &volume.Spec{PersistentVolumeSource:api.PersistentVolumeSource{HostPath: &api.HostPathVolumeSource{Path: "/foo"}}}
+	spec := &volume.Spec{PersistentVolumeSource: api.PersistentVolumeSource{HostPath: &api.HostPathVolumeSource{Path: "/foo"}}}
 	plug, err := plugMgr.FindRecyclablePluginBySpec(spec)
 	if err != nil {
 		t.Errorf("Can't find the plugin by name")
@@ -72,7 +72,7 @@ func TestRecycler(t *testing.T) {
 	if recycler.GetPath() != spec.PersistentVolumeSource.HostPath.Path {
 		t.Errorf("Expected %s but got %s", spec.PersistentVolumeSource.HostPath.Path, recycler.GetPath())
 	}
-	if err := recycler.Recycle() ; err != nil {
+	if err := recycler.Recycle(); err != nil {
 		t.Errorf("Mock Recycler expected to return nil but got %s", err)
 	}
 }

diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go
@@ -105,7 +105,7 @@ func (plugin *nfsPlugin) NewRecycler(spec *volume.Spec) (volume.Recycler, error)
 	return plugin.newRecyclerFunc(spec, plugin.host)
 }
 
-func newRecycler(spec *volume.Spec, host volume.VolumeHost)(volume.Recycler, error){
+func newRecycler(spec *volume.Spec, host volume.VolumeHost) (volume.Recycler, error) {
 	if spec.VolumeSource.HostPath != nil {
 		return &nfsRecycler{
 			volName:    spec.Name,
@@ -225,7 +225,7 @@ type nfsRecycler struct {
 	volName    string
 	server     string
 	exportPath string
-	host volume.VolumeHost
+	host       volume.VolumeHost
 }
 
 func (r *nfsRecycler) GetPath() string {
@@ -242,7 +242,7 @@ func (r *nfsRecycler) Recycle() error {
 		2. use host.client to save to API and watch it
 		3. if pod errors or times out, return error
 		   if pod exits, return nil for success
-	 */
+	*/
 
 	return nil
 }
diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go
@@ -57,12 +57,11 @@ func TestGetAccessModes(t *testing.T) {
 	}
 }
 
-
 func TestRecycler(t *testing.T) {
 	plugMgr := volume.VolumePluginMgr{}
 	plugMgr.InitPlugins([]volume.VolumePlugin{&nfsPlugin{newRecyclerFunc: newMockRecycler}}, volume.NewFakeVolumeHost("/tmp/fake", nil, nil))
 
-	spec := &volume.Spec{PersistentVolumeSource:api.PersistentVolumeSource{NFS: &api.NFSVolumeSource{Path: "/foo"}}}
+	spec := &volume.Spec{PersistentVolumeSource: api.PersistentVolumeSource{NFS: &api.NFSVolumeSource{Path: "/foo"}}}
 	plug, err := plugMgr.FindRecyclablePluginBySpec(spec)
 	if err != nil {
 		t.Errorf("Can't find the plugin by name")
@@ -74,7 +73,7 @@ func TestRecycler(t *testing.T) {
 	if recycler.GetPath() != spec.PersistentVolumeSource.NFS.Path {
 		t.Errorf("Expected %s but got %s", spec.PersistentVolumeSource.NFS.Path, recycler.GetPath())
 	}
-	if err := recycler.Recycle() ; err != nil {
+	if err := recycler.Recycle(); err != nil {
 		t.Errorf("Mock Recycler expected to return nil but got %s", err)
 	}
 }
@@ -99,7 +98,6 @@ func (r *mockRecycler) Recycle() error {
 	return nil
 }
 
-
 func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool {
 	for _, m := range modes {
 		if m == mode {

diff --git a/pkg/volume/util.go b/pkg/volume/util.go
@@ -59,7 +59,6 @@ func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeA
 
 // basicVolumeScrubber is an implementation of volume.Recycler
 type basicVolumeScrubber struct {
-
 }
 
 // podWatch provides watch semantics for a pod backed by a poller, since

diff --git a/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go b/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go
@@ -260,6 +260,8 @@ func TestBindingWithExamples(t *testing.T) {
 
 	// after the status change above, the binder picks up again
 	syncVolume(volumeIndex, mockClient, pv)
+	// the first change of the volume in the binder triggers another change
+	syncVolume(volumeIndex, mockClient, pv)
 
 	if pv.Status.Phase != api.VolumePending {
 		t.Errorf("Expected phase %s but got %s", api.VolumePending, pv.Status.Phase)