github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-07 11:04:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21398 from liggitt/time-param

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-27 03:37:07 -08:00
parent 394d5da23c ea59b4c741
commit c4ffcbdbaa
6 changed files with 217 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/kubelet_test.go
View File

@@ -26,6 +26,7 @@ import (
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
@@ -69,7 +70,8 @@ var _ = Describe("Kubelet", func() {
It("it should print the output to logs", func() {
Eventually(func() string {
rc, err := cl.Pods(api.NamespaceDefault).GetLogs("busybox", &api.PodLogOptions{}).Stream()
sinceTime := unversioned.NewTime(time.Now().Add(time.Duration(-1 * time.Hour)))
rc, err := cl.Pods(api.NamespaceDefault).GetLogs("busybox", &api.PodLogOptions{SinceTime: &sinceTime}).Stream()
if err != nil {
return ""
}