Merge pull request #143 from tiborvass/fix-sockets

crosbymichael · web-flow · commit 75bee3e2ccb6 · 2019-08-27T10:05:05.000-04:00
fstest: have CreateSocket actually create a socket
diff --git a/fs/fstest/file.go b/fs/fstest/file.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"io"
 	"math/rand"
-	"net"
 	"os"
 	"path/filepath"
+	"syscall"
 	"time"
 )
 
@@ -158,11 +158,15 @@ func Link(oldname, newname string) Applier {
 func CreateSocket(name string, perm os.FileMode) Applier {
 	return applyFn(func(root string) error {
 		fullPath := filepath.Join(root, name)
-		ln, err := net.Listen("unix", fullPath)
+		fd, err := syscall.Socket(syscall.AF_UNIX, syscall.SOCK_STREAM, 0)
 		if err != nil {
 			return err
 		}
-		defer ln.Close()
+		defer syscall.Close(fd)
+		sa := &syscall.SockaddrUnix{Name: fullPath}
+		if err := syscall.Bind(fd, sa); err != nil {
+			return err
+		}
 		return os.Chmod(fullPath, perm)
 	})
 }
diff --git a/fs/fstest/testsuite.go b/fs/fstest/testsuite.go
@@ -90,7 +90,7 @@ var (
 		Symlink("libnothing.so", "/usr/local/lib/libnothing.so.2"),
 		CreateDir("/home", 0755),
 		CreateDir("/home/derek", 0700),
-		CreateDir("/var/run/socket", 0700),
+		// TODO: CreateSocket: how should Sockets be handled in continuity?
 	)
 
 	// basicTest covers basic operations

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ var (`
`90`	`90`	`Symlink("libnothing.so", "/usr/local/lib/libnothing.so.2"),`
`91`	`91`	`CreateDir("/home", 0755),`
`92`	`92`	`CreateDir("/home/derek", 0700),`
`93`		`- CreateDir("/var/run/socket", 0700),`
	`93`	`+ // TODO: CreateSocket: how should Sockets be handled in continuity?`
`94`	`94`	`)`
`95`	`95`
`96`	`96`	`// basicTest covers basic operations`