strict-concurrency: Remove sendability issues in tests

Author: simonjbeaumont

Tests/ETCDTests/ETCDTests.swift

@@ -17,15 +17,9 @@ import NIO
 import XCTest
 
 final class EtcdClientTests: XCTestCase {
-    var eventLoopGroup: EventLoopGroup!
-    var etcdClient: EtcdClient!
-
-    override func setUp() async throws {
-        eventLoopGroup = MultiThreadedEventLoopGroup.singleton
-        etcdClient = EtcdClient(host: "localhost", port: 2379, eventLoopGroup: eventLoopGroup)
-    }
-
     func testSetAndGetStringValue() async throws {
+        let etcdClient = EtcdClient.testClient
+
         try await etcdClient.set("testKey", value: "testValue")
         let key = "testKey".data(using: .utf8)!
         let rangeRequest = RangeRequest(key: key)
@@ -36,13 +30,17 @@ final class EtcdClientTests: XCTestCase {
     }
 
     func testGetNonExistentKey() async throws {
+        let etcdClient = EtcdClient.testClient
+
         let key = "nonExistentKey".data(using: .utf8)!
         let rangeRequest = RangeRequest(key: key)
         let result = try await etcdClient.getRange(rangeRequest)
         XCTAssertNil(result)
     }
 
     func testDeleteKeyExists() async throws {
+        let etcdClient = EtcdClient.testClient
+
         let key = "testKey"
         let value = "testValue"
         try await etcdClient.set(key, value: value)
@@ -60,6 +58,8 @@ final class EtcdClientTests: XCTestCase {
     }
 
     func testDeleteNonExistentKey() async throws {
+        let etcdClient = EtcdClient.testClient
+
         let key = "testKey".data(using: .utf8)!
         let rangeRequest = RangeRequest(key: key)
 
@@ -74,6 +74,8 @@ final class EtcdClientTests: XCTestCase {
     }
 
     func testUpdateExistingKey() async throws {
+        let etcdClient = EtcdClient.testClient
+
         let key = "testKey"
         let value = "testValue"
         try await etcdClient.set(key, value: value)
@@ -95,14 +97,16 @@ final class EtcdClientTests: XCTestCase {
     }
 
     func testWatch() async throws {
+        let etcdClient = EtcdClient.testClient
+
         let key = "testKey"
         let value = "testValue".data(using: .utf8)!
 
         try await etcdClient.put(key, value: "foo")
 
         try await withThrowingTaskGroup(of: Void.self) { group in
             group.addTask {
-                try await self.etcdClient.watch(key) { watchAsyncSequence in
+                try await etcdClient.watch(key) { watchAsyncSequence in
                     var iterator = watchAsyncSequence.makeAsyncIterator()
                     let events = try await iterator.next()
                     guard let events = events else {
@@ -122,8 +126,16 @@ final class EtcdClientTests: XCTestCase {
             }
 
             try await Task.sleep(nanoseconds: 1_000_000_000)
-            try await self.etcdClient.put(key, value: String(data: value, encoding: .utf8)!)
+            try await etcdClient.put(key, value: String(data: value, encoding: .utf8)!)
             group.cancelAll()
         }
     }
 }
+
+extension EtcdClient {
+    fileprivate static let testClient = EtcdClient(
+        host: "localhost",
+        port: 2379,
+        eventLoopGroup: .singletonMultiThreadedEventLoopGroup
+    )
+}