From 9a430a80208992740486433e16149b40c2d3c2da Mon Sep 17 00:00:00 2001 From: Tedi Mitiku Date: Fri, 18 Aug 2023 10:11:30 -0400 Subject: [PATCH] add wait for logs to be stored in log tests --- ...ocker_kurtosis_backend_api_container_functions.go | 12 +----------- .../testsuite/search_logs_test/search_logs_test.go | 3 +++ .../testsuite/stream_logs_test/stream_logs_test.go | 3 +++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go index 0ee30669d9..906740e6d4 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go @@ -147,15 +147,7 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( labelStrs[labelKey.GetString()] = labelValue.GetString() } - //The APIContainer will be configured to send the logs to the Fluentbit logs collector server - logCollectorAddr, err := enclaveLogsCollector.GetEnclaveNetworkAddressString() - if err != nil { - return nil, stacktrace.Propagate(err, "An error occurred retrieving the log collector address.") - } - //fluentdLoggingDriverCnfg := docker_manager.NewFluentdLoggingDriver( - // logCollectorAddr, - // logs_collector_functions.GetKurtosisTrackedLogsCollectorLabels(), - //) + // TODO: configure the APIContainer to send the logs to the Fluentbit logs collector server createAndStartArgs := docker_manager.NewCreateAndStartContainerArgsBuilder( image, @@ -173,8 +165,6 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( ipAddr, ).WithLabels( labelStrs, - //).WithLoggingDriver( - // fluentdLoggingDriverCnfg, ).Build() if err = backend.dockerManager.FetchImage(ctx, image); err != nil { diff --git a/internal_testsuites/golang/testsuite/search_logs_test/search_logs_test.go b/internal_testsuites/golang/testsuite/search_logs_test/search_logs_test.go index 6152240c7f..fc654c038b 100644 --- a/internal_testsuites/golang/testsuite/search_logs_test/search_logs_test.go +++ b/internal_testsuites/golang/testsuite/search_logs_test/search_logs_test.go @@ -37,6 +37,8 @@ const ( logLine2 = "Starting feature 'enclave pool'" logLine3 = "Starting feature 'enclave pool with size 2'" logLine4 = "The data have being loaded" + + milliSecondsToWaitForLogs = 300 ) var ( @@ -118,6 +120,7 @@ func TestSearchLogs(t *testing.T) { require.NoError(t, err, "An error occurred adding services with log lines '%+v'", logLinesByService) require.Equal(t, len(logLinesByService), len(serviceList)) + time.Sleep(milliSecondsToWaitForLogs * time.Millisecond) // ------------------------------------- TEST RUN ------------------------------------------------- enclaveUuid := enclaveCtx.GetEnclaveUuid() diff --git a/internal_testsuites/golang/testsuite/stream_logs_test/stream_logs_test.go b/internal_testsuites/golang/testsuite/stream_logs_test/stream_logs_test.go index 282290c46f..4b2fe102d8 100644 --- a/internal_testsuites/golang/testsuite/stream_logs_test/stream_logs_test.go +++ b/internal_testsuites/golang/testsuite/stream_logs_test/stream_logs_test.go @@ -31,6 +31,8 @@ const ( secondLogLine = "test" thirdLogLine = "running" lastLogLine = "successfully" + + milliSecondsToWaitForLogs = 300 ) var ( @@ -76,6 +78,7 @@ func TestStreamLogs(t *testing.T) { serviceList, err := test_helpers.AddServicesWithLogLines(ctx, enclaveCtx, logLinesByService) require.NoError(t, err, "An error occurred adding the datastore service") + time.Sleep(milliSecondsToWaitForLogs * time.Millisecond) // ------------------------------------- TEST RUN ---------------------------------------------- enclaveUuid := enclaveCtx.GetEnclaveUuid()