vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

integration-test: use new --listen proto://address format

Browse source 
This re-enables the integration tests after the CLI UX change of
--listen.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-04-02 00:29:27 +11:00
parent 0ec0bb380f
commit e3bb2b6c39
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration-test/check_test.go
View file

@ -51,12 +51,18 @@ type ContainerdSuite struct {
// getClient returns a connection to the Suite containerd // getClient returns a connection to the Suite containerd
func (cs *ContainerdSuite) getClient(socket string) error { func (cs *ContainerdSuite) getClient(socket string) error {
// Parse proto://address form addresses.
bindParts := strings.SplitN(socket, "://", 2)
if len(bindParts) != 2 {
return fmt.Errorf("bad bind address format %s, expected proto://address", socket)
}
// reset the logger for grpc to log to dev/null so that it does not mess with our stdio // reset the logger for grpc to log to dev/null so that it does not mess with our stdio
grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags)) grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
dialOpts := []grpc.DialOption{grpc.WithInsecure()} dialOpts := []grpc.DialOption{grpc.WithInsecure()}
dialOpts = append(dialOpts, dialOpts = append(dialOpts,
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
return net.DialTimeout("unix", addr, timeout) return net.DialTimeout(bindParts[0], bindParts[1], timeout)
}, },
)) ))
conn, err := grpc.Dial(socket, dialOpts...) conn, err := grpc.Dial(socket, dialOpts...)
@ -202,7 +208,7 @@ func (cs *ContainerdSuite) SetUpSuite(c *check.C) {
c.Fatalf("Unable to created output directory '%s': %v", cs.stateDir, err) c.Fatalf("Unable to created output directory '%s': %v", cs.stateDir, err)
} }
cs.grpcSocket = filepath.Join(cs.outputDir, "containerd-master", "containerd.sock") cs.grpcSocket = "unix://" + filepath.Join(cs.outputDir, "containerd-master", "containerd.sock")
cdLogFile := filepath.Join(cs.outputDir, "containerd-master", "containerd.log") cdLogFile := filepath.Join(cs.outputDir, "containerd-master", "containerd.log")
f, err := os.OpenFile(cdLogFile, os.O_CREATE|os.O_TRUNC|os.O_RDWR|os.O_SYNC, 0777) f, err := os.OpenFile(cdLogFile, os.O_CREATE|os.O_TRUNC|os.O_RDWR|os.O_SYNC, 0777)