Cleanup e2e_node test style

Remove the use of  Except(err).NotTo(HaveOccured()), and switch to using
framework ramework.ExpectNoError(err)
This commit is contained in:
Odin Ugedal
2019-06-08 19:44:08 +02:00
parent 11abb58a5b
commit 6bb8bb0227
16 changed files with 41 additions and 44 deletions

View File

@@ -82,9 +82,9 @@ var _ = framework.KubeDescribe("ContainerLogRotation [Slow] [Serial] [Disruptive
Expect(len(pod.Status.ContainerStatuses)).To(Equal(1))
id := kubecontainer.ParseContainerID(pod.Status.ContainerStatuses[0].ContainerID).ID
r, _, err := getCRIClient()
Expect(err).NotTo(HaveOccurred())
framework.ExpectNoError(err)
status, err := r.ContainerStatus(id)
Expect(err).NotTo(HaveOccurred())
framework.ExpectNoError(err)
logPath := status.GetLogPath()
By("wait for container log being rotated to max file limit")
Eventually(func() (int, error) {