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
81bc0e5e
Commit
81bc0e5e
authored
Feb 14, 2019
by
Jose A. Rivera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CRIDriverRegistry e2e: Clarify variable name
Signed-off-by:
Jose A. Rivera
<
jarrpa@redhat.com
>
parent
1ac3b378
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
csi_volumes.go
test/e2e/storage/csi_volumes.go
+16
-16
No files found.
test/e2e/storage/csi_volumes.go
View file @
81bc0e5e
...
@@ -205,22 +205,22 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
...
@@ -205,22 +205,22 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
tests
:=
[]
struct
{
tests
:=
[]
struct
{
name
string
name
string
driverAttachable
bool
driverAttachable
bool
d
riverExists
bool
d
eployDriverCRD
bool
}{
}{
{
{
name
:
"should not require VolumeAttach for drivers without attachment"
,
name
:
"should not require VolumeAttach for drivers without attachment"
,
driverAttachable
:
false
,
driverAttachable
:
false
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
},
},
{
{
name
:
"should require VolumeAttach for drivers with attachment"
,
name
:
"should require VolumeAttach for drivers with attachment"
,
driverAttachable
:
true
,
driverAttachable
:
true
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
},
},
{
{
name
:
"should preserve attachment policy when no CSIDriver present"
,
name
:
"should preserve attachment policy when no CSIDriver present"
,
driverAttachable
:
true
,
driverAttachable
:
true
,
d
riverExists
:
false
,
d
eployDriverCRD
:
false
,
},
},
}
}
...
@@ -233,11 +233,11 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
...
@@ -233,11 +233,11 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Prefix
:
"csi-attach"
,
Prefix
:
"csi-attach"
,
}
}
driver
=
drivers
.
InitMockCSIDriver
(
config
,
test
.
d
riverExists
,
test
.
driverAttachable
,
nil
)
driver
=
drivers
.
InitMockCSIDriver
(
config
,
test
.
d
eployDriverCRD
,
test
.
driverAttachable
,
nil
)
driver
.
CreateDriver
()
driver
.
CreateDriver
()
defer
driver
.
CleanupDriver
()
defer
driver
.
CleanupDriver
()
if
test
.
d
riverExists
{
if
test
.
d
eployDriverCRD
{
defer
destroyCSIDriver
(
csics
,
driver
)
defer
destroyCSIDriver
(
csics
,
driver
)
}
}
...
@@ -308,37 +308,37 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
...
@@ -308,37 +308,37 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
tests
:=
[]
struct
{
tests
:=
[]
struct
{
name
string
name
string
podInfoOnMountVersion
*
string
podInfoOnMountVersion
*
string
d
riverExists
bool
d
eployDriverCRD
bool
expectPodInfo
bool
expectPodInfo
bool
}{
}{
{
{
name
:
"should not be passed when podInfoOnMountVersion=nil"
,
name
:
"should not be passed when podInfoOnMountVersion=nil"
,
podInfoOnMountVersion
:
nil
,
podInfoOnMountVersion
:
nil
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
expectPodInfo
:
false
,
expectPodInfo
:
false
,
},
},
{
{
name
:
"should be passed when podInfoOnMountVersion=v1"
,
name
:
"should be passed when podInfoOnMountVersion=v1"
,
podInfoOnMountVersion
:
&
podInfoV1
,
podInfoOnMountVersion
:
&
podInfoV1
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
expectPodInfo
:
true
,
expectPodInfo
:
true
,
},
},
{
{
name
:
"should not be passed when podInfoOnMountVersion=<empty string>"
,
name
:
"should not be passed when podInfoOnMountVersion=<empty string>"
,
podInfoOnMountVersion
:
&
podInfoEmpty
,
podInfoOnMountVersion
:
&
podInfoEmpty
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
expectPodInfo
:
false
,
expectPodInfo
:
false
,
},
},
{
{
name
:
"should not be passed when podInfoOnMountVersion=<unknown string>"
,
name
:
"should not be passed when podInfoOnMountVersion=<unknown string>"
,
podInfoOnMountVersion
:
&
podInfoUnknown
,
podInfoOnMountVersion
:
&
podInfoUnknown
,
d
riverExists
:
true
,
d
eployDriverCRD
:
true
,
expectPodInfo
:
false
,
expectPodInfo
:
false
,
},
},
{
{
name
:
"should not be passed when CSIDriver does not exist"
,
name
:
"should not be passed when CSIDriver does not exist"
,
d
riverExists
:
false
,
d
eployDriverCRD
:
false
,
expectPodInfo
:
false
,
expectPodInfo
:
false
,
},
},
}
}
for
_
,
t
:=
range
tests
{
for
_
,
t
:=
range
tests
{
...
@@ -350,11 +350,11 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
...
@@ -350,11 +350,11 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Prefix
:
"csi-workload"
,
Prefix
:
"csi-workload"
,
}
}
driver
=
drivers
.
InitMockCSIDriver
(
config
,
test
.
d
riverExists
,
true
,
test
.
podInfoOnMountVersion
)
driver
=
drivers
.
InitMockCSIDriver
(
config
,
test
.
d
eployDriverCRD
,
true
,
test
.
podInfoOnMountVersion
)
driver
.
CreateDriver
()
driver
.
CreateDriver
()
defer
driver
.
CleanupDriver
()
defer
driver
.
CleanupDriver
()
if
test
.
d
riverExists
{
if
test
.
d
eployDriverCRD
{
defer
destroyCSIDriver
(
csics
,
driver
)
defer
destroyCSIDriver
(
csics
,
driver
)
}
}
...
...
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