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
84aeafee
Commit
84aeafee
authored
Feb 26, 2019
by
danielqsj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix golint failures for test/e2e/cloud
parent
0d98463f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
.golint_failures
hack/.golint_failures
+0
-1
framework.go
test/e2e/cloud/framework.go
+1
-0
nodes.go
test/e2e/cloud/nodes.go
+7
-7
No files found.
hack/.golint_failures
View file @
84aeafee
...
...
@@ -650,7 +650,6 @@ test/e2e/apps
test/e2e/auth
test/e2e/autoscaling
test/e2e/chaosmonkey
test/e2e/cloud
test/e2e/common
test/e2e/framework
test/e2e/framework/ingress
...
...
test/e2e/cloud/framework.go
View file @
84aeafee
...
...
@@ -18,6 +18,7 @@ package cloud
import
"k8s.io/kubernetes/test/e2e/framework"
// SIGDescribe annotates the test with the SIG label.
func
SIGDescribe
(
text
string
,
body
func
())
bool
{
return
framework
.
KubeDescribe
(
"[sig-cloud-provider] "
+
text
,
body
)
}
test/e2e/cloud/nodes.go
View file @
84aeafee
...
...
@@ -24,23 +24,23 @@ import (
clientset
"k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
var
_
=
SIGDescribe
(
"[Feature:CloudProvider][Disruptive] Nodes"
,
func
()
{
f
:=
framework
.
NewDefaultFramework
(
"cloudprovider"
)
var
c
clientset
.
Interface
BeforeEach
(
func
()
{
ginkgo
.
BeforeEach
(
func
()
{
// Only supported in AWS/GCE because those are the only cloud providers
// where E2E test are currently running.
framework
.
SkipUnlessProviderIs
(
"aws"
,
"gce"
,
"gke"
)
c
=
f
.
ClientSet
})
It
(
"should be deleted on API server if it doesn't exist in the cloud provider"
,
func
()
{
By
(
"deleting a node on the cloud provider"
)
ginkgo
.
It
(
"should be deleted on API server if it doesn't exist in the cloud provider"
,
func
()
{
ginkgo
.
By
(
"deleting a node on the cloud provider"
)
nodeDeleteCandidates
:=
framework
.
GetReadySchedulableNodesOrDie
(
c
)
nodeToDelete
:=
nodeDeleteCandidates
.
Items
[
0
]
...
...
@@ -54,8 +54,8 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
}
newNodes
,
err
:=
framework
.
CheckNodesReady
(
c
,
len
(
origNodes
.
Items
)
-
1
,
5
*
time
.
Minute
)
Expect
(
err
)
.
To
(
BeNil
())
Expect
(
len
(
newNodes
))
.
To
(
Equal
(
len
(
origNodes
.
Items
)
-
1
))
gomega
.
Expect
(
err
)
.
To
(
gomega
.
BeNil
())
gomega
.
Expect
(
len
(
newNodes
))
.
To
(
gomega
.
Equal
(
len
(
origNodes
.
Items
)
-
1
))
_
,
err
=
c
.
CoreV1
()
.
Nodes
()
.
Get
(
nodeToDelete
.
Name
,
metav1
.
GetOptions
{})
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