WIP: Fix #556

Signed-off-by: Liang Chenye <[email protected]>

validation/util/container.go

@@ -51,9 +51,16 @@ func (r *Runtime) SetID(id string) {
 }
 
 // Create a container
-func (r *Runtime) Create() (stderr []byte, err error) {
+func (r *Runtime) Create(consoleSocket string, pidFile string) (stderr []byte, err error) {
 	var args []string
 	args = append(args, "create")
+	if consoleSocket != "" {
+		args = append(args, "--console-socket", consoleSocket)
+	}
+	if pidFile != "" {
+		args = append(args, "--pid-file", pidFile)
+	}
+
 	if r.ID != "" {
 		args = append(args, r.ID)
 	}
@@ -141,6 +148,21 @@ func (r *Runtime) State() (rspecs.State, error) {
 	return state, err
 }
 
+// Kill a container
+func (r *Runtime) Kill(signal string) error {
+	var args []string
+	args = append(args, "kill")
+	if signal != "" {
+		args = append(args, signal)
+	}
+	if r.ID != "" {
+		args = append(args, r.ID)
+	}
+
+	cmd := exec.Command(r.RuntimeCommand, args...)
+	return cmd.Run()
+}
+
 // Delete a container
 func (r *Runtime) Delete() error {
 	var args []string

validation/util/test.go

@@ -107,7 +107,7 @@ func RuntimeInsideValidate(g *generate.Generator, f PreFunc) (err error) {
 	}
 
 	r.SetID(uuid.NewV4().String())
-	stderr, err := r.Create()
+	stderr, err := r.Create("", "")
 	if err != nil {
 		os.Stderr.WriteString("failed to create the container\n")
 		os.Stderr.Write(stderr)
@@ -166,7 +166,7 @@ func RuntimeOutsideValidate(g *generate.Generator, f AfterFunc) error {
 	}
 
 	r.SetID(uuid.NewV4().String())
-	stderr, err := r.Create()
+	stderr, err := r.Create("", "")
 	if err != nil {
 		os.Stderr.WriteString("failed to create the container\n")
 		os.Stderr.Write(stderr)