replacing .New with .Run when possible

Signed-off-by: Channing Gaddy <[email protected]>
runfinch · Aug 10, 2023 · 3635d25 · 3635d25
1 parent 3d32a8e
commit 3635d25
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/e2e/vm/soci_test.go b/e2e/vm/soci_test.go
@@ -45,11 +45,11 @@ var testSoci = func(o *option.Option, installed bool) {
 			gomega.Expect(initCmdSession).Should(gexec.Exit(0))
 			command.New(o, "pull", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
 			finchPullMounts := countMounts(limactlO)
-			command.New(o, "rmi", "-f", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
+			command.Run(o, "rmi", "-f", FfmpegSociImage)
 			command.New(limactlO, "shell", "finch",
-				"sudo", "nerdctl", "--snapshotter=soci", "pull", FfmpegSociImage).WithTimeoutInSeconds(30).Run().Out.Contents()
+				"sudo", "nerdctl", "--snapshotter=soci", "pull", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
 			nerdctlPullMounts := countMounts(limactlO)
-			command.New(o, "rmi", "-f", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
+			command.Run(o, "rmi", "-f", FfmpegSociImage)
 			gomega.Expect(finchPullMounts).Should(gomega.Equal(nerdctlPullMounts))
 		})
 
@@ -62,18 +62,18 @@ var testSoci = func(o *option.Option, installed bool) {
 			gomega.Expect(initCmdSession).Should(gexec.Exit(0))
 			command.New(o, "run", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
 			finchPullMounts := countMounts(limactlO)
-			command.New(o, "rmi", "-f", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
+			command.Run(o, "rmi", "-f", FfmpegSociImage)
 			command.New(limactlO, "shell", "finch",
-				"sudo", "nerdctl", "--snapshotter=soci", "run", FfmpegSociImage).WithTimeoutInSeconds(30).Run().Out.Contents()
+				"sudo", "nerdctl", "--snapshotter=soci", "run", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
 			nerdctlPullMounts := countMounts(limactlO)
-			command.New(o, "rmi", "-f", FfmpegSociImage).WithTimeoutInSeconds(30).Run()
+			command.Run(o, "rmi", "-f", FfmpegSociImage)
 			gomega.Expect(finchPullMounts).Should(gomega.Equal(nerdctlPullMounts))
 		})
 	})
 }
 
 // counts the mounts present in the VM after pulling an image.
 func countMounts(limactlO *option.Option) int {
-	mountOutput := string(command.New(limactlO, "shell", "finch", "mount").WithTimeoutInSeconds(30).Run().Out.Contents())
+	mountOutput := command.StdoutStr(limactlO, "shell", "finch", "mount")
 	return strings.Count(mountOutput, sociMountString)
 }