Fix failing log rotation test

mullvad · Oct 7, 2024 · e23480f · e23480f
1 parent 0e32a21
commit e23480f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/ios/MullvadLogging/LogFileOutputStream.swift b/ios/MullvadLogging/LogFileOutputStream.swift
@@ -75,6 +75,11 @@ class LogFileOutputStream: TextOutputStream {
         }
     }
 
+    /// Waits for write operations to finish by issuing a synchronous closure.
+    func synchronize() {
+        queue.sync {}
+    }
+
     private func writeOnQueue(_ string: String) {
         guard let data = string.data(using: encoding) else { return }
 

diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -2496,8 +2496,8 @@
 		440E9EFA2BDA976800B1FD11 /* MullvadLogging */ = {
 			isa = PBXGroup;
 			children = (
-				7AA513852BC91C6B00D081A4 /* LogRotationTests.swift */,
 				44B02E3A2BC5732D008EDF34 /* LoggingTests.swift */,
+				7AA513852BC91C6B00D081A4 /* LogRotationTests.swift */,
 			);
 			path = MullvadLogging;
 			sourceTree = "<group>";

diff --git a/ios/MullvadVPNTests/MullvadLogging/LogRotationTests.swift b/ios/MullvadVPNTests/MullvadLogging/LogRotationTests.swift
@@ -41,10 +41,8 @@ final class LogRotationTests: XCTestCase {
         let stream = LogFileOutputStream(fileURL: logPath, header: "", fileSizeLimit: UInt64(totalLogSizeLimit))
         for _ in 0 ..< writeOperationCount {
             stream.write(stringOfSize(logChunkSize))
-
-            // Without sync between every write the test fails on Github.
-            sync()
         }
+        stream.synchronize()
 
         let actualLogCount = try fileManager.contentsOfDirectory(atPath: directoryPath.relativePath).count
         XCTAssertEqual(expectedLogCount, actualLogCount)

diff --git a/ios/MullvadVPNTests/MullvadLogging/LoggingTests.swift b/ios/MullvadVPNTests/MullvadLogging/LoggingTests.swift
@@ -10,7 +10,7 @@ import Foundation
 @testable import MullvadLogging
 import XCTest
 
-class MullvadLoggingTests: XCTestCase {
+class LoggingTests: XCTestCase {
     let fileManager = FileManager.default
     var directoryPath: URL!
 
@@ -33,7 +33,7 @@ class MullvadLoggingTests: XCTestCase {
         let fileURL = directoryPath.appendingPathComponent(UUID().uuidString)
         let stream = LogFileOutputStream(fileURL: fileURL, header: headerText)
         stream.write(logMessage)
-        sync()
+        stream.synchronize()
 
         let contents = try XCTUnwrap(String(contentsOf: fileURL))
         XCTAssertEqual(contents, "\(headerText)\n\(logMessage)")
@@ -71,7 +71,7 @@ class MullvadLoggingTests: XCTestCase {
         logPaths.forEach { url in
             let stream = LogFileOutputStream(fileURL: url, header: "")
             stream.write("test")
-            sync()
+            stream.synchronize()
         }
 
         var urls = ApplicationConfiguration.logFileURLs(for: .mainApp, in: directoryPath)