mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-01 04:33:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

groupware: fixes after rebasing and Docker library API changes

Browse Source
This commit is contained in:
Pascal Bleser
2026-04-23 14:22:39 +02:00
parent 8c41e41c9e
commit 47f70283f2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/jmap/integration_email_test.go
View File

@@ -509,7 +509,7 @@ func (s *StalwartTest) fillEmailsWithImap(folder string, count int, empty bool,
tlsConfig := &tls.Config{InsecureSkipVerify: true}
c, err := imapclient.DialTLS(net.JoinHostPort(s.ip, strconv.Itoa(s.imapPort)), &imapclient.Options{TLSConfig: tlsConfig})
c, err := imapclient.DialTLS(net.JoinHostPort(s.ip, strconv.FormatUint(uint64(s.imapPort), 10)), &imapclient.Options{TLSConfig: tlsConfig})
if err != nil {
return nil, 0, err
}

8
pkg/jmap/integration_test.go
View File

@@ -152,7 +152,7 @@ func skip(t *testing.T) bool {
type StalwartTest struct {
t *testing.T
ip string
imapPort int
imapPort uint16
container *testcontainers.DockerContainer
ctx context.Context
cancelCtx context.CancelFunc
@@ -339,7 +339,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
Env: os.Environ(),
Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
}
cmd := []string{Wireshark, "-pkSl", "-i", "lo", "-f", fmt.Sprintf("port %d", jmapPort.Int()), "-Y", "http||websocket"}
cmd := []string{Wireshark, "-pkSl", "-i", "lo", "-f", fmt.Sprintf("port %d", jmapPort.Num()), "-Y", "http||websocket"}
process, err := os.StartProcess(Wireshark, cmd, &attr)
require.NoError(t, err)
err = process.Release()
@@ -376,7 +376,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
apiPort, err := container.MappedPort(ctx, httpPort)
require.NoError(t, err)
url := fmt.Sprintf("http://%s:%d/api/principal", ip, apiPort.Int())
url := fmt.Sprintf("http://%s:%d/api/principal", ip, apiPort.Num())
for _, domain := range domains {
fmt.Printf("Creating domain '%v'\n", domain)
@@ -485,7 +485,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
return &StalwartTest{
t: t,
ip: ip,
imapPort: imapPort.Int(),
imapPort: imapPort.Num(),
container: container,
ctx: ctx,
cancelCtx: cancel,