Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
02e8ffe1
Commit
02e8ffe1
authored
Oct 26, 2017
by
linyouchong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix incorrect log
parent
f4fb38a2
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
22 additions
and
22 deletions
+22
-22
aws_ebs_test.go
pkg/volume/aws_ebs/aws_ebs_test.go
+1
-1
azure_file_test.go
pkg/volume/azure_file/azure_file_test.go
+1
-1
cephfs_test.go
pkg/volume/cephfs/cephfs_test.go
+1
-1
cinder_test.go
pkg/volume/cinder/cinder_test.go
+1
-1
configmap_test.go
pkg/volume/configmap/configmap_test.go
+1
-1
downwardapi_test.go
pkg/volume/downwardapi/downwardapi_test.go
+1
-1
empty_dir_test.go
pkg/volume/empty_dir/empty_dir_test.go
+1
-1
fc_test.go
pkg/volume/fc/fc_test.go
+1
-1
gce_pd_test.go
pkg/volume/gce_pd/gce_pd_test.go
+1
-1
git_repo_test.go
pkg/volume/git_repo/git_repo_test.go
+1
-1
glusterfs_test.go
pkg/volume/glusterfs/glusterfs_test.go
+1
-1
iscsi_test.go
pkg/volume/iscsi/iscsi_test.go
+1
-1
local_test.go
pkg/volume/local/local_test.go
+1
-1
nfs_test.go
pkg/volume/nfs/nfs_test.go
+2
-2
photon_pd_test.go
pkg/volume/photon_pd/photon_pd_test.go
+1
-1
projected_test.go
pkg/volume/projected/projected_test.go
+1
-1
rbd_test.go
pkg/volume/rbd/rbd_test.go
+1
-1
sio_volume_test.go
pkg/volume/scaleio/sio_volume_test.go
+1
-1
secret_test.go
pkg/volume/secret/secret_test.go
+1
-1
storageos_test.go
pkg/volume/storageos/storageos_test.go
+1
-1
vsphere_volume_test.go
pkg/volume/vsphere_volume/vsphere_volume_test.go
+1
-1
No files found.
pkg/volume/aws_ebs/aws_ebs_test.go
View file @
02e8ffe1
...
@@ -168,7 +168,7 @@ func TestPlugin(t *testing.T) {
...
@@ -168,7 +168,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Test Provisioner
// Test Provisioner
...
...
pkg/volume/azure_file/azure_file_test.go
View file @
02e8ffe1
...
@@ -184,7 +184,7 @@ func testPlugin(t *testing.T, tmpDir string, volumeHost volume.VolumeHost) {
...
@@ -184,7 +184,7 @@ func testPlugin(t *testing.T, tmpDir string, volumeHost volume.VolumeHost) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/cephfs/cephfs_test.go
View file @
02e8ffe1
...
@@ -111,7 +111,7 @@ func TestPlugin(t *testing.T) {
...
@@ -111,7 +111,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/cinder/cinder_test.go
View file @
02e8ffe1
...
@@ -194,7 +194,7 @@ func TestPlugin(t *testing.T) {
...
@@ -194,7 +194,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Test Provisioner
// Test Provisioner
...
...
pkg/volume/configmap/configmap_test.go
View file @
02e8ffe1
...
@@ -606,6 +606,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
...
@@ -606,6 +606,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
pkg/volume/downwardapi/downwardapi_test.go
View file @
02e8ffe1
...
@@ -287,7 +287,7 @@ func (test *downwardAPITest) tearDown() {
...
@@ -287,7 +287,7 @@ func (test *downwardAPITest) tearDown() {
if
_
,
err
:=
os
.
Stat
(
test
.
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
test
.
volumePath
);
err
==
nil
{
test
.
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
test
.
volumePath
)
test
.
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
test
.
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
test
.
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
test
.
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
os
.
RemoveAll
(
test
.
rootDir
)
os
.
RemoveAll
(
test
.
rootDir
)
}
}
...
...
pkg/volume/empty_dir/empty_dir_test.go
View file @
02e8ffe1
...
@@ -216,7 +216,7 @@ func doTestPlugin(t *testing.T, config pluginTestConfig) {
...
@@ -216,7 +216,7 @@ func doTestPlugin(t *testing.T, config pluginTestConfig) {
if
_
,
err
:=
os
.
Stat
(
volPath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volPath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volPath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volPath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Check the number of physicalMounter calls during tardown
// Check the number of physicalMounter calls during tardown
...
...
pkg/volume/fc/fc_test.go
View file @
02e8ffe1
...
@@ -181,7 +181,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -181,7 +181,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/gce_pd/gce_pd_test.go
View file @
02e8ffe1
...
@@ -161,7 +161,7 @@ func TestPlugin(t *testing.T) {
...
@@ -161,7 +161,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Test Provisioner
// Test Provisioner
...
...
pkg/volume/git_repo/git_repo_test.go
View file @
02e8ffe1
...
@@ -306,7 +306,7 @@ func doTestPlugin(scenario struct {
...
@@ -306,7 +306,7 @@ func doTestPlugin(scenario struct {
fmt
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
))
fmt
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
))
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
allErrs
=
append
(
allErrs
,
allErrs
=
append
(
allErrs
,
fmt
.
Errorf
(
"
SetUp
() failed: %v"
,
err
))
fmt
.
Errorf
(
"
TearDown
() failed: %v"
,
err
))
}
}
return
allErrs
return
allErrs
}
}
...
...
pkg/volume/glusterfs/glusterfs_test.go
View file @
02e8ffe1
...
@@ -129,7 +129,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -129,7 +129,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/iscsi/iscsi_test.go
View file @
02e8ffe1
...
@@ -179,7 +179,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -179,7 +179,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/local/local_test.go
View file @
02e8ffe1
...
@@ -193,7 +193,7 @@ func TestMountUnmount(t *testing.T) {
...
@@ -193,7 +193,7 @@ func TestMountUnmount(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/nfs/nfs_test.go
View file @
02e8ffe1
...
@@ -157,13 +157,13 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -157,13 +157,13 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
if
len
(
fake
.
Log
)
!=
1
{
if
len
(
fake
.
Log
)
!=
1
{
t
.
Errorf
(
"Unmount was not called exactly one time. It was called %d times."
,
len
(
fake
.
Log
))
t
.
Errorf
(
"Unmount was not called exactly one time. It was called %d times."
,
len
(
fake
.
Log
))
}
else
{
}
else
{
if
fake
.
Log
[
0
]
.
Action
!=
mount
.
FakeActionUnmount
{
if
fake
.
Log
[
0
]
.
Action
!=
mount
.
FakeActionUnmount
{
t
.
Errorf
(
"Unexpected mounter action: %#v"
,
fake
.
Log
[
0
])
t
.
Errorf
(
"Unexpected
un
mounter action: %#v"
,
fake
.
Log
[
0
])
}
}
}
}
...
...
pkg/volume/photon_pd/photon_pd_test.go
View file @
02e8ffe1
...
@@ -161,7 +161,7 @@ func TestPlugin(t *testing.T) {
...
@@ -161,7 +161,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Test Provisioner
// Test Provisioner
...
...
pkg/volume/projected/projected_test.go
View file @
02e8ffe1
...
@@ -1042,6 +1042,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
...
@@ -1042,6 +1042,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
pkg/volume/rbd/rbd_test.go
View file @
02e8ffe1
...
@@ -157,7 +157,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -157,7 +157,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
...
...
pkg/volume/scaleio/sio_volume_test.go
View file @
02e8ffe1
...
@@ -236,7 +236,7 @@ func TestVolumeMounterUnmounter(t *testing.T) {
...
@@ -236,7 +236,7 @@ func TestVolumeMounterUnmounter(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// are we still mapped
// are we still mapped
if
sio
.
volume
.
MappedSdcInfo
!=
nil
{
if
sio
.
volume
.
MappedSdcInfo
!=
nil
{
...
...
pkg/volume/secret/secret_test.go
View file @
02e8ffe1
...
@@ -626,6 +626,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
...
@@ -626,6 +626,6 @@ func doTestCleanAndTeardown(plugin volume.VolumePlugin, podUID types.UID, testVo
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volumePath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volumePath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
}
}
pkg/volume/storageos/storageos_test.go
View file @
02e8ffe1
...
@@ -237,7 +237,7 @@ func TestPlugin(t *testing.T) {
...
@@ -237,7 +237,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
volPath
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
volPath
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volPath
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
volPath
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
if
!
fakeManager
.
unmountCalled
{
if
!
fakeManager
.
unmountCalled
{
...
...
pkg/volume/vsphere_volume/vsphere_volume_test.go
View file @
02e8ffe1
...
@@ -144,7 +144,7 @@ func TestPlugin(t *testing.T) {
...
@@ -144,7 +144,7 @@ func TestPlugin(t *testing.T) {
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
if
_
,
err
:=
os
.
Stat
(
path
);
err
==
nil
{
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
t
.
Errorf
(
"TearDown() failed, volume path still exists: %s"
,
path
)
}
else
if
!
os
.
IsNotExist
(
err
)
{
}
else
if
!
os
.
IsNotExist
(
err
)
{
t
.
Errorf
(
"
SetUp
() failed: %v"
,
err
)
t
.
Errorf
(
"
TearDown
() failed: %v"
,
err
)
}
}
// Test Provisioner
// Test Provisioner
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment