@@ -658,12 +658,6 @@ func IsContainerRestarted(podName, containerName, namespace string, startedAt v1
658658}
659659
660660func 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\n stderr: %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\n stderr: %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 )
@@ -672,12 +666,18 @@ func SaveTestResources(labels map[string]string, additional string) {
672666 Expect (err ).NotTo (HaveOccurred ())
673667 defer file .Close ()
674668
675- _ , err = file .Write (virt .StdOutBytes ())
676- Expect (err ).NotTo (HaveOccurred ())
669+ virt := kubectl .Get ("virtualization -A" , kc.GetOptions {Output : "yaml" , Labels : labels })
670+ if virt .Error () == nil {
671+ _ , err = file .Write (virt .StdOutBytes ())
672+ Expect (err ).NotTo (HaveOccurred ())
673+ }
677674
678- _ , err = file .WriteString ("\n ---\n " )
679- Expect (err ).NotTo (HaveOccurred ())
675+ intVirt := kubectl .Get ("intvirt -A" , kc.GetOptions {Output : "yaml" , Labels : labels })
676+ if intVirt .Error () == nil {
677+ _ , err = file .WriteString ("\n ---\n " )
678+ Expect (err ).NotTo (HaveOccurred ())
680679
681- _ , err = file .Write (intVirt .StdOutBytes ())
682- Expect (err ).NotTo (HaveOccurred ())
680+ _ , err = file .Write (intVirt .StdOutBytes ())
681+ Expect (err ).NotTo (HaveOccurred ())
682+ }
683683}
0 commit comments