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
927d1b10
Commit
927d1b10
authored
Jun 18, 2018
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apiextensions: expect IsNotFound errors for disabled versions in testSimpleCRUD
parent
1daa9902
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
basic_test.go
...io/apiextensions-apiserver/test/integration/basic_test.go
+10
-8
No files found.
staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go
View file @
927d1b10
...
@@ -93,8 +93,8 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
...
@@ -93,8 +93,8 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
noxuWatch
,
err
:=
noxuResourceClients
[
v
.
Name
]
.
Watch
(
metav1
.
ListOptions
{})
noxuWatch
,
err
:=
noxuResourceClients
[
v
.
Name
]
.
Watch
(
metav1
.
ListOptions
{})
if
disabledVersions
[
v
.
Name
]
{
if
disabledVersions
[
v
.
Name
]
{
if
err
==
nil
{
if
!
errors
.
IsNotFound
(
err
)
{
t
.
Errorf
(
"expected the watch
creation fail for disabled version %s"
,
v
.
Name
)
t
.
Errorf
(
"expected the watch
operation fail with NotFound for disabled version %s, got error: %v"
,
v
.
Name
,
err
)
}
}
}
else
{
}
else
{
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -112,8 +112,8 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
...
@@ -112,8 +112,8 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
for
version
,
noxuResourceClient
:=
range
noxuResourceClients
{
for
version
,
noxuResourceClient
:=
range
noxuResourceClients
{
createdNoxuInstance
,
err
:=
instantiateVersionedCustomResource
(
t
,
testserver
.
NewVersionedNoxuInstance
(
ns
,
"foo"
,
version
),
noxuResourceClient
,
noxuDefinition
,
version
)
createdNoxuInstance
,
err
:=
instantiateVersionedCustomResource
(
t
,
testserver
.
NewVersionedNoxuInstance
(
ns
,
"foo"
,
version
),
noxuResourceClient
,
noxuDefinition
,
version
)
if
disabledVersions
[
version
]
{
if
disabledVersions
[
version
]
{
if
err
==
nil
{
if
!
errors
.
IsNotFound
(
err
)
{
t
.
Errorf
(
"expected the CR creation fail
for disabled version %s"
,
version
)
t
.
Errorf
(
"expected the CR creation fail
with NotFound for disabled version %s, got error: %v"
,
version
,
err
)
}
}
continue
continue
}
}
...
@@ -162,8 +162,9 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
...
@@ -162,8 +162,9 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
gottenNoxuInstance
,
err
:=
noxuResourceClient2
.
Get
(
"foo"
,
metav1
.
GetOptions
{})
gottenNoxuInstance
,
err
:=
noxuResourceClient2
.
Get
(
"foo"
,
metav1
.
GetOptions
{})
if
disabledVersions
[
version2
]
{
if
disabledVersions
[
version2
]
{
if
err
==
nil
{
if
!
errors
.
IsNotFound
(
err
)
{
t
.
Errorf
(
"expected the get operation fail for disabled version %s"
,
version2
)
t
.
Errorf
(
"expected the get operation fail with NotFound for disabled version %s, got error: %v"
,
version2
,
err
)
}
}
}
else
{
}
else
{
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -178,8 +179,9 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
...
@@ -178,8 +179,9 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
// List test
// List test
listWithItem
,
err
:=
noxuResourceClient2
.
List
(
metav1
.
ListOptions
{})
listWithItem
,
err
:=
noxuResourceClient2
.
List
(
metav1
.
ListOptions
{})
if
disabledVersions
[
version2
]
{
if
disabledVersions
[
version2
]
{
if
err
==
nil
{
if
!
errors
.
IsNotFound
(
err
)
{
t
.
Errorf
(
"expected the list operation fail for disabled version %s"
,
version2
)
t
.
Errorf
(
"expected the list operation fail with NotFound for disabled version %s, got error: %v"
,
version2
,
err
)
}
}
}
else
{
}
else
{
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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