Revert "Switch from "winio" to "npipe"."
This reverts commit 6cb138dd7f4d900c66b22f22b9bbde1b0c4ff975.
The "winio" project has reportedly fixed the underlying bug, so let's
try this again.
BUG=chromium:699182
TEST=None
Review-Url: https://codereview.chromium.org/2866473002
diff --git a/logdog/client/butler/streamserver/namedPipe_windows.go b/logdog/client/butler/streamserver/namedPipe_windows.go
index d416a73..fb3d0c0 100644
--- a/logdog/client/butler/streamserver/namedPipe_windows.go
+++ b/logdog/client/butler/streamserver/namedPipe_windows.go
@@ -13,7 +13,7 @@
log "github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/logdog/client/butlerlib/streamclient"
- "gopkg.in/natefinch/npipe.v2"
+ "github.com/Microsoft/go-winio"
)
// maxWindowsNamedPipeLength is the maximum length of a Windows named pipe.
@@ -42,7 +42,7 @@
"pipePath": pipePath,
}.Debugf(ctx, "Creating Windows server socket Listener.")
- l, err := npipe.Listen(pipePath)
+ l, err := winio.ListenPipe(pipePath, nil)
if err != nil {
return nil, "", errors.Annotate(err).Reason("failed to listen on named pipe").Err()
}
diff --git a/logdog/client/butler/streamserver/namedPipe_windows_test.go b/logdog/client/butler/streamserver/namedPipe_windows_test.go
index 63edd13..f056ffb 100644
--- a/logdog/client/butler/streamserver/namedPipe_windows_test.go
+++ b/logdog/client/butler/streamserver/namedPipe_windows_test.go
@@ -23,9 +23,7 @@
pid := os.Getpid()
- // TODO(dnj): Re-enable after switching back to "winio" pending bug.
- // See: crbug.com/702105
- SkipConvey(`A named pipe server`, t, func() {
+ Convey(`A named pipe server`, t, func() {
ctx := context.Background()
Convey(`Will refuse to create if there is an empty path.`, func() {
diff --git a/logdog/client/butlerlib/streamclient/client_namedPipe_windows.go b/logdog/client/butlerlib/streamclient/client_namedPipe_windows.go
index abeb7a7..e1d2708 100644
--- a/logdog/client/butlerlib/streamclient/client_namedPipe_windows.go
+++ b/logdog/client/butlerlib/streamclient/client_namedPipe_windows.go
@@ -8,7 +8,7 @@
"errors"
"io"
- "gopkg.in/natefinch/npipe.v2"
+ "github.com/Microsoft/go-winio"
)
func registerPlatformProtocols(r *Registry) {
@@ -24,7 +24,7 @@
return &clientImpl{
factory: func() (io.WriteCloser, error) {
- return npipe.Dial(LocalNamedPipePath(path))
+ return winio.DialPipe(LocalNamedPipePath(path), nil)
},
}, nil
}
