github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63643 from k82cn/rm_ns_dstest

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Removed unused namespace in UT helper func.

Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>

**Release note**:
```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-11 21:07:44 -07:00 committed by GitHub
commit 4725f07dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/daemonset/daemonset_test.go
View File

@ -264,7 +264,6 @@ func validateDaemonSetPodsAndMarkReady(
func validateDaemonSetStatus( func validateDaemonSetStatus(
dsClient appstyped.DaemonSetInterface, dsClient appstyped.DaemonSetInterface,
dsName string, dsName string,
dsNamespace string,
expectedNumberReady int32, expectedNumberReady int32,
t *testing.T) { t *testing.T) {
if err := wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) { if err := wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) {
@ -341,7 +340,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
} }
validateDaemonSetPodsAndMarkReady(podClient, podInformer, 1, t) validateDaemonSetPodsAndMarkReady(podClient, podInformer, 1, t)
validateDaemonSetStatus(dsClient, ds.Name, ds.Namespace, 1, t) validateDaemonSetStatus(dsClient, ds.Name, 1, t)
}) })
} }
@ -373,7 +372,7 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
addNodes(nodeClient, 0, 5, nil, t) addNodes(nodeClient, 0, 5, nil, t)
validateDaemonSetPodsAndMarkReady(podClient, podInformer, 5, t) validateDaemonSetPodsAndMarkReady(podClient, podInformer, 5, t)
validateDaemonSetStatus(dsClient, ds.Name, ds.Namespace, 5, t) validateDaemonSetStatus(dsClient, ds.Name, 5, t)
}) })
} }
@ -412,7 +411,7 @@ func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
} }
validateDaemonSetPodsAndMarkReady(podClient, podInformer, 1, t) validateDaemonSetPodsAndMarkReady(podClient, podInformer, 1, t)
validateDaemonSetStatus(dsClient, ds.Name, ds.Namespace, 1, t) validateDaemonSetStatus(dsClient, ds.Name, 1, t)
}) })
} }