Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-14 09:45:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Wrote and applied helper function for tests

Browse source 
replaced with new function

removed log/slog

readded log/slog when needed

fixed last testwriter problems
This commit is contained in:
miampf 2024-01-22 14:18:49 +01:00
parent 944bdedc59
commit 76ada50c17
No known key found for this signature in database
GPG key ID: 376EAC0E5307A669
55 changed files with 133 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

9
debugd/internal/filetransfer/filetransfer_test.go
View file

@ -9,7 +9,6 @@ package filetransfer
import (
"errors"
"io"
"log/slog"
"testing"
"github.com/edgelesssys/constellation/v2/debugd/internal/filetransfer/streamer"
@ -118,7 +117,7 @@ func TestSendFiles(t *testing.T) {
streamer := &stubStreamReadWriter{readStreamErr: tc.readStreamErr}
stream := &stubSendFilesStream{sendErr: tc.sendErr}
transfer := &FileTransferer{
log: slog.New(slog.NewTextHandler(logger.TestWriter{T: t}, nil)),
log: logger.NewTest(t),
streamer: streamer,
showProgress: false,
}
@ -255,7 +254,7 @@ func TestRecvFiles(t *testing.T) {
streamer := &stubStreamReadWriter{writeStreamErr: tc.writeStreamErr}
stream := &fakeRecvFilesStream{msgs: tc.msgs, recvErr: tc.recvErr}
transfer := New(slog.New(slog.NewTextHandler(logger.TestWriter{T: t}, nil)), streamer, false)
transfer := New(logger.NewTest(t), streamer, false)
if tc.recvAlreadyStarted {
transfer.receiveStarted = true
}
@ -308,7 +307,7 @@ func TestGetSetFiles(t *testing.T) {
assert := assert.New(t)
streamer := &dummyStreamReadWriter{}
transfer := New(slog.New(slog.NewTextHandler(logger.TestWriter{T: t}, nil)), streamer, false)
transfer := New(logger.NewTest(t), streamer, false)
if tc.setFiles != nil {
transfer.SetFiles(*tc.setFiles)
}
@ -320,7 +319,7 @@ func TestGetSetFiles(t *testing.T) {
}
func TestConcurrency(t *testing.T) {
ft := New(slog.New(slog.NewTextHandler(logger.TestWriter{T: t}, nil)), &stubStreamReadWriter{}, false)
ft := New(logger.NewTest(t), &stubStreamReadWriter{}, false)
sendFiles := func() {
_ = ft.SendFiles(&stubSendFilesStream{})