mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-07 16:32:21 +02:00
Enable goroutine leak checks for more tests.
This commit is contained in:
parent
9adb762ccf
commit
b77525603c
|
@ -47,48 +47,50 @@ func TestFileWatcher_NotExist(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFileWatcher_File(t *testing.T) {
|
func TestFileWatcher_File(t *testing.T) {
|
||||||
tmpdir := t.TempDir()
|
ensureNoGoroutinesLeak(t, func(t *testing.T) {
|
||||||
filename := path.Join(tmpdir, "test.txt")
|
tmpdir := t.TempDir()
|
||||||
if err := os.WriteFile(filename, []byte("Hello world!"), 0644); err != nil {
|
filename := path.Join(tmpdir, "test.txt")
|
||||||
t.Fatal(err)
|
if err := os.WriteFile(filename, []byte("Hello world!"), 0644); err != nil {
|
||||||
}
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
modified := make(chan struct{})
|
modified := make(chan struct{})
|
||||||
w, err := NewFileWatcher(filename, func(filename string) {
|
w, err := NewFileWatcher(filename, func(filename string) {
|
||||||
modified <- struct{}{}
|
modified <- struct{}{}
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer w.Close()
|
||||||
|
|
||||||
|
if err := os.WriteFile(filename, []byte("Updated"), 0644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
<-modified
|
||||||
|
|
||||||
|
ctxTimeout, cancel := context.WithTimeout(context.Background(), testWatcherNoEventTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-modified:
|
||||||
|
t.Error("should not have received another event")
|
||||||
|
case <-ctxTimeout.Done():
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.WriteFile(filename, []byte("Updated"), 0644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
<-modified
|
||||||
|
|
||||||
|
ctxTimeout, cancel = context.WithTimeout(context.Background(), testWatcherNoEventTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-modified:
|
||||||
|
t.Error("should not have received another event")
|
||||||
|
case <-ctxTimeout.Done():
|
||||||
|
}
|
||||||
})
|
})
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
defer w.Close()
|
|
||||||
|
|
||||||
if err := os.WriteFile(filename, []byte("Updated"), 0644); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
<-modified
|
|
||||||
|
|
||||||
ctxTimeout, cancel := context.WithTimeout(context.Background(), testWatcherNoEventTimeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-modified:
|
|
||||||
t.Error("should not have received another event")
|
|
||||||
case <-ctxTimeout.Done():
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := os.WriteFile(filename, []byte("Updated"), 0644); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
<-modified
|
|
||||||
|
|
||||||
ctxTimeout, cancel = context.WithTimeout(context.Background(), testWatcherNoEventTimeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-modified:
|
|
||||||
t.Error("should not have received another event")
|
|
||||||
case <-ctxTimeout.Done():
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFileWatcher_Rename(t *testing.T) {
|
func TestFileWatcher_Rename(t *testing.T) {
|
||||||
|
|
|
@ -112,24 +112,26 @@ func waitForEvent(ctx context.Context, t *testing.T, ch <-chan struct{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_GrpcClients_EtcdInitial(t *testing.T) {
|
func Test_GrpcClients_EtcdInitial(t *testing.T) {
|
||||||
_, addr1 := NewGrpcServerForTest(t)
|
ensureNoGoroutinesLeak(t, func(t *testing.T) {
|
||||||
_, addr2 := NewGrpcServerForTest(t)
|
_, addr1 := NewGrpcServerForTest(t)
|
||||||
|
_, addr2 := NewGrpcServerForTest(t)
|
||||||
|
|
||||||
etcd := NewEtcdForTest(t)
|
etcd := NewEtcdForTest(t)
|
||||||
|
|
||||||
SetEtcdValue(etcd, "/grpctargets/one", []byte("{\"address\":\""+addr1+"\"}"))
|
SetEtcdValue(etcd, "/grpctargets/one", []byte("{\"address\":\""+addr1+"\"}"))
|
||||||
SetEtcdValue(etcd, "/grpctargets/two", []byte("{\"address\":\""+addr2+"\"}"))
|
SetEtcdValue(etcd, "/grpctargets/two", []byte("{\"address\":\""+addr2+"\"}"))
|
||||||
|
|
||||||
client, _ := NewGrpcClientsWithEtcdForTest(t, etcd)
|
client, _ := NewGrpcClientsWithEtcdForTest(t, etcd)
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
if err := client.WaitForInitialized(ctx); err != nil {
|
if err := client.WaitForInitialized(ctx); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if clients := client.GetClients(); len(clients) != 2 {
|
if clients := client.GetClients(); len(clients) != 2 {
|
||||||
t.Errorf("Expected two clients, got %+v", clients)
|
t.Errorf("Expected two clients, got %+v", clients)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_GrpcClients_EtcdUpdate(t *testing.T) {
|
func Test_GrpcClients_EtcdUpdate(t *testing.T) {
|
||||||
|
@ -231,57 +233,59 @@ func Test_GrpcClients_EtcdIgnoreSelf(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_GrpcClients_DnsDiscovery(t *testing.T) {
|
func Test_GrpcClients_DnsDiscovery(t *testing.T) {
|
||||||
lookup := newMockDnsLookupForTest(t)
|
ensureNoGoroutinesLeak(t, func(t *testing.T) {
|
||||||
target := "testgrpc:12345"
|
lookup := newMockDnsLookupForTest(t)
|
||||||
ip1 := net.ParseIP("192.168.0.1")
|
target := "testgrpc:12345"
|
||||||
ip2 := net.ParseIP("192.168.0.2")
|
ip1 := net.ParseIP("192.168.0.1")
|
||||||
targetWithIp1 := fmt.Sprintf("%s (%s)", target, ip1)
|
ip2 := net.ParseIP("192.168.0.2")
|
||||||
targetWithIp2 := fmt.Sprintf("%s (%s)", target, ip2)
|
targetWithIp1 := fmt.Sprintf("%s (%s)", target, ip1)
|
||||||
lookup.Set("testgrpc", []net.IP{ip1})
|
targetWithIp2 := fmt.Sprintf("%s (%s)", target, ip2)
|
||||||
client, dnsMonitor := NewGrpcClientsForTest(t, target)
|
lookup.Set("testgrpc", []net.IP{ip1})
|
||||||
ch := client.getWakeupChannelForTesting()
|
client, dnsMonitor := NewGrpcClientsForTest(t, target)
|
||||||
|
ch := client.getWakeupChannelForTesting()
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
dnsMonitor.checkHostnames()
|
dnsMonitor.checkHostnames()
|
||||||
if clients := client.GetClients(); len(clients) != 1 {
|
if clients := client.GetClients(); len(clients) != 1 {
|
||||||
t.Errorf("Expected one client, got %+v", clients)
|
t.Errorf("Expected one client, got %+v", clients)
|
||||||
} else if clients[0].Target() != targetWithIp1 {
|
} else if clients[0].Target() != targetWithIp1 {
|
||||||
t.Errorf("Expected target %s, got %s", targetWithIp1, clients[0].Target())
|
t.Errorf("Expected target %s, got %s", targetWithIp1, clients[0].Target())
|
||||||
} else if !clients[0].ip.Equal(ip1) {
|
} else if !clients[0].ip.Equal(ip1) {
|
||||||
t.Errorf("Expected IP %s, got %s", ip1, clients[0].ip)
|
t.Errorf("Expected IP %s, got %s", ip1, clients[0].ip)
|
||||||
}
|
}
|
||||||
|
|
||||||
lookup.Set("testgrpc", []net.IP{ip1, ip2})
|
lookup.Set("testgrpc", []net.IP{ip1, ip2})
|
||||||
drainWakeupChannel(ch)
|
drainWakeupChannel(ch)
|
||||||
dnsMonitor.checkHostnames()
|
dnsMonitor.checkHostnames()
|
||||||
waitForEvent(ctx, t, ch)
|
waitForEvent(ctx, t, ch)
|
||||||
|
|
||||||
if clients := client.GetClients(); len(clients) != 2 {
|
if clients := client.GetClients(); len(clients) != 2 {
|
||||||
t.Errorf("Expected two client, got %+v", clients)
|
t.Errorf("Expected two client, got %+v", clients)
|
||||||
} else if clients[0].Target() != targetWithIp1 {
|
} else if clients[0].Target() != targetWithIp1 {
|
||||||
t.Errorf("Expected target %s, got %s", targetWithIp1, clients[0].Target())
|
t.Errorf("Expected target %s, got %s", targetWithIp1, clients[0].Target())
|
||||||
} else if !clients[0].ip.Equal(ip1) {
|
} else if !clients[0].ip.Equal(ip1) {
|
||||||
t.Errorf("Expected IP %s, got %s", ip1, clients[0].ip)
|
t.Errorf("Expected IP %s, got %s", ip1, clients[0].ip)
|
||||||
} else if clients[1].Target() != targetWithIp2 {
|
} else if clients[1].Target() != targetWithIp2 {
|
||||||
t.Errorf("Expected target %s, got %s", targetWithIp2, clients[1].Target())
|
t.Errorf("Expected target %s, got %s", targetWithIp2, clients[1].Target())
|
||||||
} else if !clients[1].ip.Equal(ip2) {
|
} else if !clients[1].ip.Equal(ip2) {
|
||||||
t.Errorf("Expected IP %s, got %s", ip2, clients[1].ip)
|
t.Errorf("Expected IP %s, got %s", ip2, clients[1].ip)
|
||||||
}
|
}
|
||||||
|
|
||||||
lookup.Set("testgrpc", []net.IP{ip2})
|
lookup.Set("testgrpc", []net.IP{ip2})
|
||||||
drainWakeupChannel(ch)
|
drainWakeupChannel(ch)
|
||||||
dnsMonitor.checkHostnames()
|
dnsMonitor.checkHostnames()
|
||||||
waitForEvent(ctx, t, ch)
|
waitForEvent(ctx, t, ch)
|
||||||
|
|
||||||
if clients := client.GetClients(); len(clients) != 1 {
|
if clients := client.GetClients(); len(clients) != 1 {
|
||||||
t.Errorf("Expected one client, got %+v", clients)
|
t.Errorf("Expected one client, got %+v", clients)
|
||||||
} else if clients[0].Target() != targetWithIp2 {
|
} else if clients[0].Target() != targetWithIp2 {
|
||||||
t.Errorf("Expected target %s, got %s", targetWithIp2, clients[0].Target())
|
t.Errorf("Expected target %s, got %s", targetWithIp2, clients[0].Target())
|
||||||
} else if !clients[0].ip.Equal(ip2) {
|
} else if !clients[0].ip.Equal(ip2) {
|
||||||
t.Errorf("Expected IP %s, got %s", ip2, clients[0].ip)
|
t.Errorf("Expected IP %s, got %s", ip2, clients[0].ip)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_GrpcClients_DnsDiscoveryInitialFailed(t *testing.T) {
|
func Test_GrpcClients_DnsDiscoveryInitialFailed(t *testing.T) {
|
||||||
|
@ -320,55 +324,57 @@ func Test_GrpcClients_DnsDiscoveryInitialFailed(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_GrpcClients_Encryption(t *testing.T) {
|
func Test_GrpcClients_Encryption(t *testing.T) {
|
||||||
serverKey, err := rsa.GenerateKey(rand.Reader, 1024)
|
ensureNoGoroutinesLeak(t, func(t *testing.T) {
|
||||||
if err != nil {
|
serverKey, err := rsa.GenerateKey(rand.Reader, 1024)
|
||||||
t.Fatal(err)
|
if err != nil {
|
||||||
}
|
|
||||||
clientKey, err := rsa.GenerateKey(rand.Reader, 1024)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
serverCert := GenerateSelfSignedCertificateForTesting(t, 1024, "Server cert", serverKey)
|
|
||||||
clientCert := GenerateSelfSignedCertificateForTesting(t, 1024, "Testing client", clientKey)
|
|
||||||
|
|
||||||
dir := t.TempDir()
|
|
||||||
serverPrivkeyFile := path.Join(dir, "server-privkey.pem")
|
|
||||||
serverPubkeyFile := path.Join(dir, "server-pubkey.pem")
|
|
||||||
serverCertFile := path.Join(dir, "server-cert.pem")
|
|
||||||
WritePrivateKey(serverKey, serverPrivkeyFile) // nolint
|
|
||||||
WritePublicKey(&serverKey.PublicKey, serverPubkeyFile) // nolint
|
|
||||||
os.WriteFile(serverCertFile, serverCert, 0755) // nolint
|
|
||||||
clientPrivkeyFile := path.Join(dir, "client-privkey.pem")
|
|
||||||
clientPubkeyFile := path.Join(dir, "client-pubkey.pem")
|
|
||||||
clientCertFile := path.Join(dir, "client-cert.pem")
|
|
||||||
WritePrivateKey(clientKey, clientPrivkeyFile) // nolint
|
|
||||||
WritePublicKey(&clientKey.PublicKey, clientPubkeyFile) // nolint
|
|
||||||
os.WriteFile(clientCertFile, clientCert, 0755) // nolint
|
|
||||||
|
|
||||||
serverConfig := goconf.NewConfigFile()
|
|
||||||
serverConfig.AddOption("grpc", "servercertificate", serverCertFile)
|
|
||||||
serverConfig.AddOption("grpc", "serverkey", serverPrivkeyFile)
|
|
||||||
serverConfig.AddOption("grpc", "clientca", clientCertFile)
|
|
||||||
_, addr := NewGrpcServerForTestWithConfig(t, serverConfig)
|
|
||||||
|
|
||||||
clientConfig := goconf.NewConfigFile()
|
|
||||||
clientConfig.AddOption("grpc", "targets", addr)
|
|
||||||
clientConfig.AddOption("grpc", "clientcertificate", clientCertFile)
|
|
||||||
clientConfig.AddOption("grpc", "clientkey", clientPrivkeyFile)
|
|
||||||
clientConfig.AddOption("grpc", "serverca", serverCertFile)
|
|
||||||
clients, _ := NewGrpcClientsForTestWithConfig(t, clientConfig, nil)
|
|
||||||
|
|
||||||
ctx, cancel1 := context.WithTimeout(context.Background(), time.Second)
|
|
||||||
defer cancel1()
|
|
||||||
|
|
||||||
if err := clients.WaitForInitialized(ctx); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, client := range clients.GetClients() {
|
|
||||||
if _, err := client.GetServerId(ctx); err != nil {
|
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
clientKey, err := rsa.GenerateKey(rand.Reader, 1024)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
serverCert := GenerateSelfSignedCertificateForTesting(t, 1024, "Server cert", serverKey)
|
||||||
|
clientCert := GenerateSelfSignedCertificateForTesting(t, 1024, "Testing client", clientKey)
|
||||||
|
|
||||||
|
dir := t.TempDir()
|
||||||
|
serverPrivkeyFile := path.Join(dir, "server-privkey.pem")
|
||||||
|
serverPubkeyFile := path.Join(dir, "server-pubkey.pem")
|
||||||
|
serverCertFile := path.Join(dir, "server-cert.pem")
|
||||||
|
WritePrivateKey(serverKey, serverPrivkeyFile) // nolint
|
||||||
|
WritePublicKey(&serverKey.PublicKey, serverPubkeyFile) // nolint
|
||||||
|
os.WriteFile(serverCertFile, serverCert, 0755) // nolint
|
||||||
|
clientPrivkeyFile := path.Join(dir, "client-privkey.pem")
|
||||||
|
clientPubkeyFile := path.Join(dir, "client-pubkey.pem")
|
||||||
|
clientCertFile := path.Join(dir, "client-cert.pem")
|
||||||
|
WritePrivateKey(clientKey, clientPrivkeyFile) // nolint
|
||||||
|
WritePublicKey(&clientKey.PublicKey, clientPubkeyFile) // nolint
|
||||||
|
os.WriteFile(clientCertFile, clientCert, 0755) // nolint
|
||||||
|
|
||||||
|
serverConfig := goconf.NewConfigFile()
|
||||||
|
serverConfig.AddOption("grpc", "servercertificate", serverCertFile)
|
||||||
|
serverConfig.AddOption("grpc", "serverkey", serverPrivkeyFile)
|
||||||
|
serverConfig.AddOption("grpc", "clientca", clientCertFile)
|
||||||
|
_, addr := NewGrpcServerForTestWithConfig(t, serverConfig)
|
||||||
|
|
||||||
|
clientConfig := goconf.NewConfigFile()
|
||||||
|
clientConfig.AddOption("grpc", "targets", addr)
|
||||||
|
clientConfig.AddOption("grpc", "clientcertificate", clientCertFile)
|
||||||
|
clientConfig.AddOption("grpc", "clientkey", clientPrivkeyFile)
|
||||||
|
clientConfig.AddOption("grpc", "serverca", serverCertFile)
|
||||||
|
clients, _ := NewGrpcClientsForTestWithConfig(t, clientConfig, nil)
|
||||||
|
|
||||||
|
ctx, cancel1 := context.WithTimeout(context.Background(), time.Second)
|
||||||
|
defer cancel1()
|
||||||
|
|
||||||
|
if err := clients.WaitForInitialized(ctx); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, client := range clients.GetClients() {
|
||||||
|
if _, err := client.GetServerId(ctx); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue