From 8002e10fbbfeca3c55d5baf0f1630595fadedd44 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Fri, 1 Apr 2016 09:18:51 -0700 Subject: [PATCH 1/2] node e2e Output failed health checks as string not bytes --- test/e2e_node/e2e_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go index f30285a70063e..9749d738a7504 100644 --- a/test/e2e_node/e2e_service.go +++ b/test/e2e_node/e2e_service.go @@ -155,7 +155,7 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error { go func() { err := cmd.Run() if err != nil { - cmdErrorChan <- fmt.Errorf("%s Exited with status %v. Output:\n%v", cmd, err, *cmd.OutputBuffer) + cmdErrorChan <- fmt.Errorf("%s Exited with status %v. Output:\n%s", cmd, err, *cmd.OutputBuffer) } close(cmdErrorChan) }() From 015b9a6489a8ba1fc4365692d9546d5d36e33ab2 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Fri, 1 Apr 2016 09:48:19 -0700 Subject: [PATCH 2/2] Retry failed image pulls. Closes #23669. --- test/e2e_node/conformance_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/e2e_node/conformance_test.go b/test/e2e_node/conformance_test.go index 9afb0b692cda7..c5a26533f1d62 100644 --- a/test/e2e_node/conformance_test.go +++ b/test/e2e_node/conformance_test.go @@ -28,8 +28,10 @@ import ( ) const ( - retryTimeout = 4 * time.Minute - pollInterval = time.Second * 5 + retryTimeout = time.Minute * 4 + pollInterval = time.Second * 5 + imageRetryTimeout = time.Minute * 2 + imagePullInterval = time.Second * 15 ) var _ = Describe("Container Conformance Test", func() { @@ -55,10 +57,10 @@ var _ = Describe("Container Conformance Test", func() { conformImages = append(conformImages, image) } for _, image := range conformImages { - if err := image.Pull(); err != nil { - Expect(err).NotTo(HaveOccurred()) - break - } + // Pulling images from gcr.io is flaky, so retry failures + Eventually(func() error { + return image.Pull() + }, imageRetryTimeout, imagePullInterval).ShouldNot(HaveOccurred()) } }) It("it should list pulled images [Conformance]", func() {