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

cleanup flockerVolumeTest in /tmp

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
Jess Frazelle 2016-12-14 15:22:28 -08:00
parent ba617fdd1b
commit ce11f74961
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/volume/flocker/flocker_util_test.go
View File

@ -18,6 +18,7 @@ package flocker
import ( import (
"fmt" "fmt"
"os"
"testing" "testing"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
@ -38,7 +39,9 @@ func TestFlockerUtil_CreateVolume(t *testing.T) {
} }
fakeFlockerClient := newFakeFlockerClient() fakeFlockerClient := newFakeFlockerClient()
provisioner := newTestableProvisioner(assert, options).(*flockerVolumeProvisioner) dir, p := newTestableProvisioner(assert, options)
provisioner := p.(*flockerVolumeProvisioner)
defer os.RemoveAll(dir)
provisioner.flockerClient = fakeFlockerClient provisioner.flockerClient = fakeFlockerClient
flockerUtil := &FlockerUtil{} flockerUtil := &FlockerUtil{}

15
pkg/volume/flocker/flocker_volume_test.go
View File

@ -18,6 +18,7 @@ package flocker
import ( import (
"fmt" "fmt"
"os"
"testing" "testing"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
@ -29,7 +30,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOptions) volume.Provisioner { func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOptions) (string, volume.Provisioner) {
tmpDir, err := utiltesting.MkTmpdir("flockervolumeTest") tmpDir, err := utiltesting.MkTmpdir("flockervolumeTest")
assert.NoError(err, fmt.Sprintf("can't make a temp dir: %v", err)) assert.NoError(err, fmt.Sprintf("can't make a temp dir: %v", err))
@ -41,7 +42,7 @@ func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOpti
provisioner, err := plug.(*flockerPlugin).newProvisionerInternal(options, &fakeFlockerUtil{}) provisioner, err := plug.(*flockerPlugin).newProvisionerInternal(options, &fakeFlockerUtil{})
return provisioner return tmpDir, provisioner
} }
func TestProvision(t *testing.T) { func TestProvision(t *testing.T) {
@ -53,7 +54,8 @@ func TestProvision(t *testing.T) {
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
} }
provisioner := newTestableProvisioner(assert, options) dir, provisioner := newTestableProvisioner(assert, options)
defer os.RemoveAll(dir)
persistentSpec, err := provisioner.Provision() persistentSpec, err := provisioner.Provision()
assert.NoError(err, "Provision() failed: ", err) assert.NoError(err, "Provision() failed: ", err)
@ -81,7 +83,8 @@ func TestProvision(t *testing.T) {
}, },
} }
provisioner = newTestableProvisioner(assert, options) dir, provisioner = newTestableProvisioner(assert, options)
defer os.RemoveAll(dir)
persistentSpec, err = provisioner.Provision() persistentSpec, err = provisioner.Provision()
assert.Error(err, "Provision() did not fail with Parameters specified") assert.Error(err, "Provision() did not fail with Parameters specified")
@ -92,8 +95,8 @@ func TestProvision(t *testing.T) {
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
} }
provisioner = newTestableProvisioner(assert, options) dir, provisioner = newTestableProvisioner(assert, options)
defer os.RemoveAll(dir)
persistentSpec, err = provisioner.Provision() persistentSpec, err = provisioner.Provision()
assert.Error(err, "Provision() did not fail with Selector specified") assert.Error(err, "Provision() did not fail with Selector specified")
} }