Merge pull request #72 from mrunalp/ctr_remove_stop

Stop container first if it is running on RemoveContainer

server/container.go

@@ -352,6 +352,17 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
 		return nil, fmt.Errorf("specified container not found: %s", *containerName)
 	}
 
+	if err := s.runtime.UpdateStatus(c); err != nil {
+		return nil, fmt.Errorf("failed to update container state: %v", err)
+	}
+
+	cState := s.runtime.ContainerStatus(c)
+	if cState.Status == ContainerStateCreated || cState.Status == ContainerStateRunning {
+		if err := s.runtime.StopContainer(c); err != nil {
+			return nil, fmt.Errorf("failed to stop container %s: %v", *containerName, err)
+		}
+	}
+
 	if err := s.runtime.DeleteContainer(c); err != nil {
 		return nil, fmt.Errorf("failed to delete container %s: %v", *containerName, err)
 	}

test/ctr.bats

@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+
+load helpers
+
+function teardown() {
+	cleanup_test
+}
+
+@test "ctr remove" {
+	# this test requires docker, thus it can't yet be run in a container
+	if [ "$TRAVIS" = "true" ]; then # instead of $TRAVIS, add a function is_containerized to skip here
+		skip "cannot yet run this test in a container, use sudo make localintegration"
+	fi
+
+	start_ocid
+	run ocic pod create --config "$TESTDATA"/sandbox_config.json
+	[ "$status" -eq 0 ]
+	echo "$output"
+	pod_id="$output"
+	run ocic ctr create --config "$TESTDATA"/container_redis.json --pod "$pod_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+	ctr_id="$output"
+	run ocic ctr start --id "$ctr_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+	run ocic ctr remove --id "$ctr_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+	run ocic pod stop --id "$pod_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+	run ocic pod remove --id "$pod_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+	stop_ocid
+	cleanup_pods
+}