Fix Flaky MixAudio Unit tests (#389)

* fixFlakyMixAudioUT * data race
finos · Nov 15, 2024 · 83d6acd · 83d6acd
1 parent dbf3b70
commit 83d6acd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/logger/LoggerThread.cpp b/logger/LoggerThread.cpp
@@ -22,8 +22,6 @@ LoggerThread::LoggerThread(const char* logFileName, bool logStdOut, bool logStdE
       _lastMaintenanceTime(0),
       _thread(new std::thread([this] { this->run(); }))
 {
-    _reOpenLog.test_and_set();
-    reopenLogFile();
 }
 
 void LoggerThread::reopenLogFile()
@@ -52,6 +50,9 @@ void LoggerThread::run()
     concurrency::setThreadName("Logger");
     char localTime[timeStringLength];
     bool gotLogItem = false;
+    _reOpenLog.test_and_set();
+    reopenLogFile();
+
     for (;;)
     {
         const auto item = _logQueue.front();
@@ -78,10 +79,12 @@ void LoggerThread::run()
         {
             if (gotLogItem)
             {
-                if (_logStdOut) {
+                if (_logStdOut)
+                {
                     fflush(stdout);
                 }
-                if (_logStdErr) {
+                if (_logStdErr)
+                {
                     fflush(stderr);
                 }
             }
@@ -238,7 +241,7 @@ void LoggerThread::immediate(std::chrono::system_clock::time_point timestamp,
         formatTo(stdout, localTime, logLevel, threadId, message);
         fflush(stdout);
     }
-    if (_logStdErr && !std::strcmp(logLevel, "ERROR")) 
+    if (_logStdErr && !std::strcmp(logLevel, "ERROR"))
     {
         formatTo(stderr, localTime, logLevel, threadId, message);
         fflush(stderr);

diff --git a/test/integration/FFTanalysis.cpp b/test/integration/FFTanalysis.cpp
@@ -99,7 +99,7 @@ void analyzeRecording(const std::vector<int16_t>& recording,
         for (size_t i = 0; i < frequencies[threadId].size() && i < 50; ++i)
         {
             if (std::find_if(frequencyPeaks.begin(), frequencyPeaks.end(), [&](double f) {
-                    return std::abs(f - frequencies[threadId][i]) < 90;
+                    return std::abs(f - frequencies[threadId][i]) < f * 0.1;
                 }) == frequencyPeaks.end())
             {
                 logger::debug("added new freq %.3f", logId, frequencies[threadId][i]);