Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -17,7 +17,7 @@ import ( |
| 17 | 17 |
// This used to work, it test a log of PageSize-1 (gh#4851) |
| 18 | 18 |
func (s *DockerSuite) TestLogsContainerSmallerThanPage(c *check.C) {
|
| 19 | 19 |
testLen := 32767 |
| 20 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n =; done; echo", testLen))
|
|
| 20 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
|
|
| 21 | 21 |
|
| 22 | 22 |
id := strings.TrimSpace(out) |
| 23 | 23 |
dockerCmd(c, "wait", id) |
| ... | ... |
@@ -30,7 +30,7 @@ func (s *DockerSuite) TestLogsContainerSmallerThanPage(c *check.C) {
|
| 30 | 30 |
// Regression test: When going over the PageSize, it used to panic (gh#4851) |
| 31 | 31 |
func (s *DockerSuite) TestLogsContainerBiggerThanPage(c *check.C) {
|
| 32 | 32 |
testLen := 32768 |
| 33 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n =; done; echo", testLen))
|
|
| 33 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
|
|
| 34 | 34 |
|
| 35 | 35 |
id := strings.TrimSpace(out) |
| 36 | 36 |
dockerCmd(c, "wait", id) |
| ... | ... |
@@ -43,7 +43,7 @@ func (s *DockerSuite) TestLogsContainerBiggerThanPage(c *check.C) {
|
| 43 | 43 |
// Regression test: When going much over the PageSize, it used to block (gh#4851) |
| 44 | 44 |
func (s *DockerSuite) TestLogsContainerMuchBiggerThanPage(c *check.C) {
|
| 45 | 45 |
testLen := 33000 |
| 46 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n =; done; echo", testLen))
|
|
| 46 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
|
|
| 47 | 47 |
|
| 48 | 48 |
id := strings.TrimSpace(out) |
| 49 | 49 |
dockerCmd(c, "wait", id) |
| ... | ... |
@@ -55,7 +55,7 @@ func (s *DockerSuite) TestLogsContainerMuchBiggerThanPage(c *check.C) {
|
| 55 | 55 |
|
| 56 | 56 |
func (s *DockerSuite) TestLogsTimestamps(c *check.C) {
|
| 57 | 57 |
testLen := 100 |
| 58 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo =; done;", testLen))
|
|
| 58 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo = >> a.a; done; cat a.a", testLen))
|
|
| 59 | 59 |
|
| 60 | 60 |
id := strings.TrimSpace(out) |
| 61 | 61 |
dockerCmd(c, "wait", id) |