|
9 | 9 | "fmt" |
10 | 10 | "net/http" |
11 | 11 | "os" |
12 | | - "os/exec" |
13 | 12 | "path/filepath" |
14 | 13 | "strconv" |
15 | 14 | "strings" |
@@ -803,15 +802,15 @@ func ContainerCreate(opt *option.Option, pOpt util.NewOpt) { |
803 | 802 | dummyDev2 := "/dev/dummy-zero2" |
804 | 803 |
|
805 | 804 | // Create dummy devices (major number 1 for char devices) |
806 | | - err := exec.Command("mknod", dummyDev1, "c", "1", "5").Run() |
807 | | - Expect(err).Should(BeNil()) |
808 | | - err = exec.Command("mknod", dummyDev2, "c", "1", "6").Run() |
809 | | - Expect(err).Should(BeNil()) |
| 805 | + mknodOpt1, _ := pOpt([]string{"mknod", dummyDev1, "c", "1", "5"}) |
| 806 | + command.Run(mknodOpt1) |
| 807 | + mknodOpt2, _ := pOpt([]string{"mknod", dummyDev2, "c", "1", "6"}) |
| 808 | + command.Run(mknodOpt2) |
810 | 809 |
|
811 | 810 | // Cleanup dummy devices after test |
812 | 811 | defer func() { |
813 | | - exec.Command("rm", "-f", dummyDev1).Run() |
814 | | - exec.Command("rm", "-f", dummyDev2).Run() |
| 812 | + rmOpt, _ := pOpt([]string{"rm", "-f", dummyDev1, dummyDev2}) |
| 813 | + command.Run(rmOpt) |
815 | 814 | }() |
816 | 815 |
|
817 | 816 | // define options |
@@ -877,7 +876,7 @@ func ContainerCreate(opt *option.Option, pOpt util.NewOpt) { |
877 | 876 | // inspect container |
878 | 877 | resp := command.Stdout(opt, "inspect", testContainerName) |
879 | 878 | var inspect []*dockercompat.Container |
880 | | - err = json.Unmarshal(resp, &inspect) |
| 879 | + err := json.Unmarshal(resp, &inspect) |
881 | 880 | Expect(err).Should(BeNil()) |
882 | 881 | Expect(inspect).Should(HaveLen(1)) |
883 | 882 |
|
|
0 commit comments