Skip to content

Commit 0de12aa

Browse files
committed
Fix Windows test failures
1 parent d2f7a9c commit 0de12aa

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

common/bufio/fd_demux_windows_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func getSocketFD(t *testing.T, conn net.PacketConn) int {
2828
func TestFDDemultiplexer_Create(t *testing.T) {
2929
t.Parallel()
3030

31-
demux, err := NewFDDemultiplexer(context.Background())
31+
demux, err := NewFDPoller(context.Background())
3232
require.NoError(t, err)
3333

3434
err = demux.Close()
@@ -38,19 +38,19 @@ func TestFDDemultiplexer_Create(t *testing.T) {
3838
func TestFDDemultiplexer_CreateMultiple(t *testing.T) {
3939
t.Parallel()
4040

41-
demux1, err := NewFDDemultiplexer(context.Background())
41+
demux1, err := NewFDPoller(context.Background())
4242
require.NoError(t, err)
4343
defer demux1.Close()
4444

45-
demux2, err := NewFDDemultiplexer(context.Background())
45+
demux2, err := NewFDPoller(context.Background())
4646
require.NoError(t, err)
4747
defer demux2.Close()
4848
}
4949

5050
func TestFDDemultiplexer_AddRemove(t *testing.T) {
5151
t.Parallel()
5252

53-
demux, err := NewFDDemultiplexer(context.Background())
53+
demux, err := NewFDPoller(context.Background())
5454
require.NoError(t, err)
5555
defer demux.Close()
5656

@@ -71,7 +71,7 @@ func TestFDDemultiplexer_AddRemove(t *testing.T) {
7171
func TestFDDemultiplexer_RapidAddRemove(t *testing.T) {
7272
t.Parallel()
7373

74-
demux, err := NewFDDemultiplexer(context.Background())
74+
demux, err := NewFDPoller(context.Background())
7575
require.NoError(t, err)
7676
defer demux.Close()
7777

@@ -95,7 +95,7 @@ func TestFDDemultiplexer_RapidAddRemove(t *testing.T) {
9595
func TestFDDemultiplexer_ConcurrentAccess(t *testing.T) {
9696
t.Parallel()
9797

98-
demux, err := NewFDDemultiplexer(context.Background())
98+
demux, err := NewFDPoller(context.Background())
9999
require.NoError(t, err)
100100
defer demux.Close()
101101

@@ -136,7 +136,7 @@ func TestFDDemultiplexer_ReceiveEvent(t *testing.T) {
136136
ctx, cancel := context.WithCancel(context.Background())
137137
defer cancel()
138138

139-
demux, err := NewFDDemultiplexer(ctx)
139+
demux, err := NewFDPoller(ctx)
140140
require.NoError(t, err)
141141
defer demux.Close()
142142

@@ -182,7 +182,7 @@ func TestFDDemultiplexer_ReceiveEvent(t *testing.T) {
182182
func TestFDDemultiplexer_CloseWhilePolling(t *testing.T) {
183183
t.Parallel()
184184

185-
demux, err := NewFDDemultiplexer(context.Background())
185+
demux, err := NewFDPoller(context.Background())
186186
require.NoError(t, err)
187187

188188
conn, err := net.ListenPacket("udp", "127.0.0.1:0")
@@ -213,7 +213,7 @@ func TestFDDemultiplexer_CloseWhilePolling(t *testing.T) {
213213
func TestFDDemultiplexer_RemoveNonExistent(t *testing.T) {
214214
t.Parallel()
215215

216-
demux, err := NewFDDemultiplexer(context.Background())
216+
demux, err := NewFDPoller(context.Background())
217217
require.NoError(t, err)
218218
defer demux.Close()
219219

@@ -223,7 +223,7 @@ func TestFDDemultiplexer_RemoveNonExistent(t *testing.T) {
223223
func TestFDDemultiplexer_AddAfterClose(t *testing.T) {
224224
t.Parallel()
225225

226-
demux, err := NewFDDemultiplexer(context.Background())
226+
demux, err := NewFDPoller(context.Background())
227227
require.NoError(t, err)
228228

229229
err = demux.Close()
@@ -243,7 +243,7 @@ func TestFDDemultiplexer_AddAfterClose(t *testing.T) {
243243
func TestFDDemultiplexer_MultipleSocketsSimultaneous(t *testing.T) {
244244
t.Parallel()
245245

246-
demux, err := NewFDDemultiplexer(context.Background())
246+
demux, err := NewFDPoller(context.Background())
247247
require.NoError(t, err)
248248
defer demux.Close()
249249

@@ -274,7 +274,7 @@ func TestFDDemultiplexer_ContextCancellation(t *testing.T) {
274274
t.Parallel()
275275

276276
ctx, cancel := context.WithCancel(context.Background())
277-
demux, err := NewFDDemultiplexer(ctx)
277+
demux, err := NewFDPoller(ctx)
278278
require.NoError(t, err)
279279

280280
conn, err := net.ListenPacket("udp", "127.0.0.1:0")

common/wepoll/afd_windows.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func (a *AFD) Poll(baseSocket windows.Handle, events uint32, iosb *windows.IO_ST
7575
pollInfo.Handles[0].Events = events
7676
pollInfo.Handles[0].Status = 0
7777

78+
iosb.Status = uintptr(STATUS_PENDING)
7879
size := uint32(unsafe.Sizeof(*pollInfo))
7980

8081
err := NtDeviceIoControlFile(

0 commit comments

Comments
 (0)