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
f4d798f4
Commit
f4d798f4
authored
Feb 03, 2017
by
shashidharatd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix few flakes in federation e2e tests
parent
ab794c61
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
federated-daemonset.go
test/e2e_federation/federated-daemonset.go
+3
-1
federated-deployment.go
test/e2e_federation/federated-deployment.go
+3
-1
federated-replicaset.go
test/e2e_federation/federated-replicaset.go
+3
-1
federated-secret.go
test/e2e_federation/federated-secret.go
+3
-1
No files found.
test/e2e_federation/federated-daemonset.go
View file @
f4d798f4
...
...
@@ -192,7 +192,9 @@ func createDaemonSetOrFail(clientset *fedclientset.Clientset, namespace string)
func
deleteDaemonSetOrFail
(
clientset
*
fedclientset
.
Clientset
,
nsName
string
,
daemonsetName
string
,
orphanDependents
*
bool
)
{
By
(
fmt
.
Sprintf
(
"Deleting daemonset %q in namespace %q"
,
daemonsetName
,
nsName
))
err
:=
clientset
.
Extensions
()
.
DaemonSets
(
nsName
)
.
Delete
(
daemonsetName
,
&
metav1
.
DeleteOptions
{
OrphanDependents
:
orphanDependents
})
framework
.
ExpectNoError
(
err
,
"Error deleting daemonset %q in namespace %q"
,
daemonsetName
,
nsName
)
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
framework
.
ExpectNoError
(
err
,
"Error deleting daemonset %q in namespace %q"
,
daemonsetName
,
nsName
)
}
// Wait for the daemonset to be deleted.
err
=
wait
.
Poll
(
5
*
time
.
Second
,
wait
.
ForeverTestTimeout
,
func
()
(
bool
,
error
)
{
...
...
test/e2e_federation/federated-deployment.go
View file @
f4d798f4
...
...
@@ -262,7 +262,9 @@ func updateDeploymentOrFail(clientset *fedclientset.Clientset, namespace string)
func
deleteDeploymentOrFail
(
clientset
*
fedclientset
.
Clientset
,
nsName
string
,
deploymentName
string
,
orphanDependents
*
bool
)
{
By
(
fmt
.
Sprintf
(
"Deleting deployment %q in namespace %q"
,
deploymentName
,
nsName
))
err
:=
clientset
.
Extensions
()
.
Deployments
(
nsName
)
.
Delete
(
deploymentName
,
&
metav1
.
DeleteOptions
{
OrphanDependents
:
orphanDependents
})
framework
.
ExpectNoError
(
err
,
"Error deleting deployment %q in namespace %q"
,
deploymentName
,
nsName
)
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
framework
.
ExpectNoError
(
err
,
"Error deleting deployment %q in namespace %q"
,
deploymentName
,
nsName
)
}
// Wait for the deployment to be deleted.
err
=
wait
.
Poll
(
5
*
time
.
Second
,
wait
.
ForeverTestTimeout
,
func
()
(
bool
,
error
)
{
...
...
test/e2e_federation/federated-replicaset.go
View file @
f4d798f4
...
...
@@ -248,7 +248,9 @@ func createReplicaSetOrFail(clientset *fedclientset.Clientset, namespace string)
func
deleteReplicaSetOrFail
(
clientset
*
fedclientset
.
Clientset
,
nsName
string
,
replicaSetName
string
,
orphanDependents
*
bool
)
{
By
(
fmt
.
Sprintf
(
"Deleting replica set %q in namespace %q"
,
replicaSetName
,
nsName
))
err
:=
clientset
.
Extensions
()
.
ReplicaSets
(
nsName
)
.
Delete
(
replicaSetName
,
&
metav1
.
DeleteOptions
{
OrphanDependents
:
orphanDependents
})
framework
.
ExpectNoError
(
err
,
"Error deleting replica set %q in namespace %q"
,
replicaSetName
,
nsName
)
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
framework
.
ExpectNoError
(
err
,
"Error deleting replica set %q in namespace %q"
,
replicaSetName
,
nsName
)
}
// Wait for the replicaSet to be deleted.
err
=
wait
.
Poll
(
5
*
time
.
Second
,
wait
.
ForeverTestTimeout
,
func
()
(
bool
,
error
)
{
...
...
test/e2e_federation/federated-secret.go
View file @
f4d798f4
...
...
@@ -171,7 +171,9 @@ func createSecretOrFail(clientset *fedclientset.Clientset, nsName string) *v1.Se
func
deleteSecretOrFail
(
clientset
*
fedclientset
.
Clientset
,
nsName
string
,
secretName
string
,
orphanDependents
*
bool
)
{
By
(
fmt
.
Sprintf
(
"Deleting secret %q in namespace %q"
,
secretName
,
nsName
))
err
:=
clientset
.
Core
()
.
Secrets
(
nsName
)
.
Delete
(
secretName
,
&
metav1
.
DeleteOptions
{
OrphanDependents
:
orphanDependents
})
framework
.
ExpectNoError
(
err
,
"Error deleting secret %q in namespace %q"
,
secretName
,
nsName
)
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
framework
.
ExpectNoError
(
err
,
"Error deleting secret %q in namespace %q"
,
secretName
,
nsName
)
}
// Wait for the secret to be deleted.
err
=
wait
.
Poll
(
5
*
time
.
Second
,
wait
.
ForeverTestTimeout
,
func
()
(
bool
,
error
)
{
...
...
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