personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2026-05-15 20:37:36 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
JackDoan
2026-05-14 12:20:08 -05:00
parent ad0c99f262
commit 9a30c5b6a1
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
overlay/tio/tun_file_linux_test.go
View File

@@ -10,6 +10,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/slackhq/nebula/wire"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@@ -27,16 +28,13 @@ func newReadPipe(t *testing.T) int {
} }
func TestPoll_WakeForShutdown_WakesFriends(t *testing.T) { func TestPoll_WakeForShutdown_WakesFriends(t *testing.T) {
pipe1 := newReadPipe(t)
pipe2 := newReadPipe(t)
parent, err := NewPollQueueSet() parent, err := NewPollQueueSet()
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, parent.Add(pipe1)) require.NoError(t, parent.Add(newReadPipe(t)))
require.NoError(t, parent.Add(pipe2)) require.NoError(t, parent.Add(newReadPipe(t)))
t.Cleanup(func() { // QueueSet.Close owns the read fds we Added — don't register a separate
_ = unix.Close(pipe1) // Cleanup to close them or we'll double-close whatever fd the kernel
_ = unix.Close(pipe2) // has since reused.
})
readers := parent.Queues() readers := parent.Queues()
errs := make([]error, len(readers)) errs := make([]error, len(readers))
@@ -45,7 +43,8 @@ func TestPoll_WakeForShutdown_WakesFriends(t *testing.T) {
wg.Add(1) wg.Add(1)
go func(i int, r Queue) { go func(i int, r Queue) {
defer wg.Done() defer wg.Done()
_, errs[i] = r.Read() pkts := make([]wire.TunPacket, 1)
_, errs[i] = r.Read(pkts, make([]byte, 64))
}(i, r) }(i, r)
} }
@@ -71,7 +70,11 @@ func TestPoll_WakeForShutdown_WakesFriends(t *testing.T) {
} }
func TestPoll_Close_Idempotent(t *testing.T) { func TestPoll_Close_Idempotent(t *testing.T) {
tf, err := newPoll(newReadPipe(t), 1) shutdownFd, err := unix.Eventfd(0, unix.EFD_NONBLOCK|unix.EFD_CLOEXEC)
require.NoError(t, err)
t.Cleanup(func() { _ = unix.Close(shutdownFd) })
tf, err := newPoll(newReadPipe(t), shutdownFd)
require.NoError(t, err) require.NoError(t, err)
if err := tf.Close(); err != nil { if err := tf.Close(); err != nil {
t.Fatalf("first Close: %v", err) t.Fatalf("first Close: %v", err)