Since we now have a common set of error definitions, mapped to existing error codes, we no longer need the specialized error codes used for interaction with linux processes. The main issue was that string matching was being used to map these to useful error codes. With this change, we use errors defined in the `errdefs` package, which map cleanly to GRPC error codes and are recoverable on either side of the request. The main focus of this PR was in removin these from the shim. We may need follow ups to ensure error codes are preserved by the `Tasks` service. Signed-off-by: Stephen J Day <stephen.day@docker.com>
		
			
				
	
	
		
			188 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			188 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package containerd
 | 
						|
 | 
						|
import (
 | 
						|
	"bytes"
 | 
						|
	"context"
 | 
						|
	"flag"
 | 
						|
	"fmt"
 | 
						|
	"os"
 | 
						|
	"os/exec"
 | 
						|
	"syscall"
 | 
						|
	"testing"
 | 
						|
	"time"
 | 
						|
 | 
						|
	"github.com/Sirupsen/logrus"
 | 
						|
	"github.com/containerd/containerd/log"
 | 
						|
	"github.com/containerd/containerd/namespaces"
 | 
						|
	"github.com/containerd/containerd/testutil"
 | 
						|
)
 | 
						|
 | 
						|
const (
 | 
						|
	defaultRoot = "/var/lib/containerd-test"
 | 
						|
	testImage   = "docker.io/library/alpine:latest"
 | 
						|
)
 | 
						|
 | 
						|
var (
 | 
						|
	address      string
 | 
						|
	noDaemon     bool
 | 
						|
	supportsCriu bool
 | 
						|
)
 | 
						|
 | 
						|
func init() {
 | 
						|
	flag.StringVar(&address, "address", "/run/containerd-test/containerd.sock", "The address to the containerd socket for use in the tests")
 | 
						|
	flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")
 | 
						|
	flag.Parse()
 | 
						|
}
 | 
						|
 | 
						|
func testContext() (context.Context, context.CancelFunc) {
 | 
						|
	ctx, cancel := context.WithCancel(context.Background())
 | 
						|
	ctx = namespaces.WithNamespace(ctx, "testing")
 | 
						|
	return ctx, cancel
 | 
						|
}
 | 
						|
 | 
						|
func TestMain(m *testing.M) {
 | 
						|
	if testing.Short() {
 | 
						|
		os.Exit(m.Run())
 | 
						|
	}
 | 
						|
	testutil.RequiresRootM()
 | 
						|
	// check if criu is installed on the system
 | 
						|
	_, err := exec.LookPath("criu")
 | 
						|
	supportsCriu = err == nil
 | 
						|
 | 
						|
	var (
 | 
						|
		cmd         *exec.Cmd
 | 
						|
		buf         = bytes.NewBuffer(nil)
 | 
						|
		ctx, cancel = testContext()
 | 
						|
	)
 | 
						|
	defer cancel()
 | 
						|
 | 
						|
	if !noDaemon {
 | 
						|
		// setup a new containerd daemon if !testing.Short
 | 
						|
		cmd = exec.Command("containerd",
 | 
						|
			"--root", defaultRoot,
 | 
						|
			"--address", address,
 | 
						|
		)
 | 
						|
		cmd.Stderr = buf
 | 
						|
		if err := cmd.Start(); err != nil {
 | 
						|
			cmd.Wait()
 | 
						|
			fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())
 | 
						|
			os.Exit(1)
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	client, err := waitForDaemonStart(ctx, address)
 | 
						|
	if err != nil {
 | 
						|
		if cmd.Process != nil {
 | 
						|
			cmd.Process.Kill()
 | 
						|
		}
 | 
						|
		cmd.Wait()
 | 
						|
		fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())
 | 
						|
		os.Exit(1)
 | 
						|
	}
 | 
						|
 | 
						|
	// print out the version in information
 | 
						|
	version, err := client.Version(ctx)
 | 
						|
	if err != nil {
 | 
						|
		fmt.Fprintf(os.Stderr, "error getting version: %s", err)
 | 
						|
		os.Exit(1)
 | 
						|
	}
 | 
						|
 | 
						|
	// allow comparison with containerd under test
 | 
						|
	log.G(ctx).WithFields(logrus.Fields{
 | 
						|
		"version":  version.Version,
 | 
						|
		"revision": version.Revision,
 | 
						|
	}).Info("running tests against containerd")
 | 
						|
 | 
						|
	// pull a seed image
 | 
						|
	if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil {
 | 
						|
		cmd.Process.Signal(syscall.SIGTERM)
 | 
						|
		cmd.Wait()
 | 
						|
		fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())
 | 
						|
		os.Exit(1)
 | 
						|
	}
 | 
						|
	if err := client.Close(); err != nil {
 | 
						|
		fmt.Fprintln(os.Stderr, err)
 | 
						|
	}
 | 
						|
 | 
						|
	// run the test
 | 
						|
	status := m.Run()
 | 
						|
 | 
						|
	if !noDaemon {
 | 
						|
		// tear down the daemon and resources created
 | 
						|
		if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
 | 
						|
			fmt.Fprintln(os.Stderr, err)
 | 
						|
		}
 | 
						|
		if err := cmd.Wait(); err != nil {
 | 
						|
			fmt.Fprintln(os.Stderr, err)
 | 
						|
		}
 | 
						|
		if err := os.RemoveAll(defaultRoot); err != nil {
 | 
						|
			fmt.Fprintln(os.Stderr, err)
 | 
						|
			os.Exit(1)
 | 
						|
		}
 | 
						|
		// only print containerd logs if the test failed
 | 
						|
		if status != 0 {
 | 
						|
			fmt.Fprintln(os.Stderr, buf.String())
 | 
						|
		}
 | 
						|
	}
 | 
						|
	os.Exit(status)
 | 
						|
}
 | 
						|
 | 
						|
func waitForDaemonStart(ctx context.Context, address string) (*Client, error) {
 | 
						|
	var (
 | 
						|
		client  *Client
 | 
						|
		serving bool
 | 
						|
		err     error
 | 
						|
	)
 | 
						|
 | 
						|
	for i := 0; i < 20; i++ {
 | 
						|
		if client == nil {
 | 
						|
			client, err = New(address)
 | 
						|
		}
 | 
						|
		if err == nil {
 | 
						|
			serving, err = client.IsServing(ctx)
 | 
						|
			if serving {
 | 
						|
				return client, nil
 | 
						|
			}
 | 
						|
		}
 | 
						|
		time.Sleep(100 * time.Millisecond)
 | 
						|
	}
 | 
						|
	return nil, fmt.Errorf("containerd did not start within 2s: %v", err)
 | 
						|
}
 | 
						|
 | 
						|
func newClient(t testing.TB, address string, opts ...ClientOpt) (*Client, error) {
 | 
						|
	if testing.Short() {
 | 
						|
		t.Skip()
 | 
						|
	}
 | 
						|
	// testutil.RequiresRoot(t) is not needed here (already called in TestMain)
 | 
						|
	return New(address, opts...)
 | 
						|
}
 | 
						|
 | 
						|
func TestNewClient(t *testing.T) {
 | 
						|
	client, err := newClient(t, address)
 | 
						|
	if err != nil {
 | 
						|
		t.Fatal(err)
 | 
						|
	}
 | 
						|
	if client == nil {
 | 
						|
		t.Fatal("New() returned nil client")
 | 
						|
	}
 | 
						|
	if err := client.Close(); err != nil {
 | 
						|
		t.Errorf("client closed returned errror %v", err)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func TestImagePull(t *testing.T) {
 | 
						|
	client, err := newClient(t, address)
 | 
						|
	if err != nil {
 | 
						|
		t.Fatal(err)
 | 
						|
	}
 | 
						|
	defer client.Close()
 | 
						|
 | 
						|
	ctx, cancel := testContext()
 | 
						|
	defer cancel()
 | 
						|
	_, err = client.Pull(ctx, testImage)
 | 
						|
	if err != nil {
 | 
						|
		t.Error(err)
 | 
						|
		return
 | 
						|
	}
 | 
						|
}
 |