Skip to content

Commit 33c0def

Browse files
committed
chore(ci): fix afterEach dump save
Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com>
1 parent d6d0828 commit 33c0def

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

tests/e2e/util_test.go

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -658,26 +658,25 @@ func IsContainerRestarted(podName, containerName, namespace string, startedAt v1
658658
}
659659

660660
func SaveTestResources(labels map[string]string, additional string) {
661-
virt := kubectl.Get("virtualization -A", kc.GetOptions{Output: "yaml", Labels: labels})
662-
Expect(virt.Error()).NotTo(HaveOccurred(), "cmd: %s\nstderr: %s", virt.GetCmd(), virt.StdErr())
663-
664-
intVirt := kubectl.Get("intvirt -A", kc.GetOptions{Output: "yaml", Labels: labels})
665-
Expect(intVirt.Error()).NotTo(HaveOccurred(), "cmd: %s\nstderr: %s", intVirt.GetCmd(), intVirt.StdErr())
666-
667661
additional = strings.ToLower(additional)
668662
additional = strings.ReplaceAll(strings.ToLower(additional), " ", "_")
669663
str := fmt.Sprintf("/tmp/e2e_failed__%s__%s.yaml", labels["testcase"], additional)
670-
671664
file, err := os.OpenFile(str, os.O_CREATE, 0644)
672665
Expect(err).NotTo(HaveOccurred())
673666
defer file.Close()
674667

675-
_, err = file.Write(virt.StdOutBytes())
676-
Expect(err).NotTo(HaveOccurred())
668+
virt := kubectl.Get("virtualization -A", kc.GetOptions{Output: "yaml", Labels: labels})
669+
if virt.Error() == nil {
670+
_, err = file.Write(virt.StdOutBytes())
671+
Expect(err).NotTo(HaveOccurred())
672+
}
677673

678-
_, err = file.WriteString("\n---\n")
679-
Expect(err).NotTo(HaveOccurred())
674+
intVirt := kubectl.Get("intvirt -A", kc.GetOptions{Output: "yaml", Labels: labels})
675+
if intVirt.Error() == nil {
676+
_, err = file.WriteString("\n---\n")
677+
Expect(err).NotTo(HaveOccurred())
680678

681-
_, err = file.Write(intVirt.StdOutBytes())
682-
Expect(err).NotTo(HaveOccurred())
679+
_, err = file.Write(intVirt.StdOutBytes())
680+
Expect(err).NotTo(HaveOccurred())
681+
}
683682
}

0 commit comments

Comments
 (0)