From ea006b6368dbd9dbfd297deb6ddb3f070b72d043 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Mon, 26 Mar 2018 15:33:38 +0100
Subject: [PATCH] Remove @testable use of NIO. (#11)

Motivation:

When this was in-tree with NIO we could safely use @testable imports to
get at the project internals, because we couldn't possibly regress against
them. This is no longer true, so we should avoid @testable imports.

Modifications:

Removed all @testable imports.

Changed NIO.Posix.open to Darwin/Glibc.open.

Replaced uses of fulfilled with either wait() or callbacks.

Result:

Less chance of randomly breaking due to NIO changes.
---
 .../OpenSSLIntegrationTest.swift              | 29 ++++++++++++++-----
 .../NIOOpenSSLTests/SSLCertificateTest.swift  |  2 +-
 .../NIOOpenSSLTests/SSLPrivateKeyTests.swift  |  2 +-
 .../TLSConfigurationTest.swift                |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Tests/NIOOpenSSLTests/OpenSSLIntegrationTest.swift b/Tests/NIOOpenSSLTests/OpenSSLIntegrationTest.swift
index 83ef1937..346adcbc 100644
--- a/Tests/NIOOpenSSLTests/OpenSSLIntegrationTest.swift
+++ b/Tests/NIOOpenSSLTests/OpenSSLIntegrationTest.swift
@@ -14,7 +14,7 @@
 
 import XCTest
 import CNIOOpenSSL
-@testable import NIO
+import NIO
 @testable import NIOOpenSSL
 import NIOTLS
 import class Foundation.Process
@@ -298,8 +298,8 @@ class OpenSSLIntegrationTest: XCTestCase {
         guard let fileName = fileName else {
             fatalError("couldn't make temp file")
         }
-        let tempFile = try fileName.withCString { ptr in
-            return try Posix.open(file: ptr, oFlag: O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, mode: 0o644)
+        let tempFile = fileName.withCString { ptr in
+            return open(ptr, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0o644)
         }
         precondition(tempFile > 1, String(cString: strerror(errno)))
         let fileBio = BIO_new_fp(fdopen(tempFile, "w+"), BIO_CLOSE)
@@ -487,7 +487,12 @@ class OpenSSLIntegrationTest: XCTestCase {
         serverClosed = true
 
         for promise in promises {
-            XCTAssert(promise.futureResult.fulfilled)
+            // This should never block, but it may throw because the I/O is complete.
+            do {
+                _ = try promise.futureResult.wait()
+            } catch {
+                // Suppress all errors, they're fine.
+            }
         }
     }
 
@@ -600,7 +605,7 @@ class OpenSSLIntegrationTest: XCTestCase {
         let closePromise: EventLoopPromise<Void> = channel.eventLoop.newPromise()
         channel.close(promise: closePromise)
 
-        XCTAssertTrue(closePromise.futureResult.fulfilled)
+        XCTAssertNoThrow(try closePromise.futureResult.wait())
     }
 
     func testAddingTlsToActiveChannelStillHandshakes() throws {
@@ -729,6 +734,7 @@ class OpenSSLIntegrationTest: XCTestCase {
     func testDontLoseClosePromises() throws {
         let serverChannel = EmbeddedChannel()
         let clientChannel = EmbeddedChannel()
+        var channelClosed = false
         defer {
             // We know this will throw.
             _ = try? serverChannel.finish()
@@ -754,10 +760,15 @@ class OpenSSLIntegrationTest: XCTestCase {
         // synchronization: all of this should succeed synchronously. If it doesn't, that's
         // a bug too!
         let closePromise = serverChannel.close()
-        XCTAssertFalse(closePromise.fulfilled)
+        closePromise.whenComplete {
+            // This looks like unsynchronized access to channelClosed, but it isn't: as we're
+            // using EmbeddedChannel here there is no cross-thread hopping.
+            channelClosed = true
+        }
+        XCTAssertFalse(channelClosed)
 
         serverChannel.pipeline.fireChannelInactive()
-        XCTAssertTrue(closePromise.fulfilled)
+        XCTAssertTrue(channelClosed)
 
         closePromise.map {
             XCTFail("Unexpected success")
@@ -940,7 +951,9 @@ class OpenSSLIntegrationTest: XCTestCase {
         _ = try clientChannel.writeAndFlush(originalBuffer).wait()
 
         // At this time all the writes should have succeeded.
-        XCTAssertTrue(promises.map { $0.fulfilled }.reduce(true, { $0 && $1 }))
+        for promise in promises {
+            XCTAssertNoThrow(try promise.wait())
+        }
 
         let newBuffer = try completionPromise.futureResult.wait()
         XCTAssertEqual(newBuffer, originalBuffer)
diff --git a/Tests/NIOOpenSSLTests/SSLCertificateTest.swift b/Tests/NIOOpenSSLTests/SSLCertificateTest.swift
index e6da0350..1a226b76 100644
--- a/Tests/NIOOpenSSLTests/SSLCertificateTest.swift
+++ b/Tests/NIOOpenSSLTests/SSLCertificateTest.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-@testable import NIO
+import NIO
 @testable import NIOOpenSSL
 
 let multiSanCert = """
diff --git a/Tests/NIOOpenSSLTests/SSLPrivateKeyTests.swift b/Tests/NIOOpenSSLTests/SSLPrivateKeyTests.swift
index 9ee7ad65..35f9750c 100644
--- a/Tests/NIOOpenSSLTests/SSLPrivateKeyTests.swift
+++ b/Tests/NIOOpenSSLTests/SSLPrivateKeyTests.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-@testable import NIO
+import NIO
 @testable import NIOOpenSSL
 
 class SSLPrivateKeyTest: XCTestCase {
diff --git a/Tests/NIOOpenSSLTests/TLSConfigurationTest.swift b/Tests/NIOOpenSSLTests/TLSConfigurationTest.swift
index ca1609b0..9dbd90e0 100644
--- a/Tests/NIOOpenSSLTests/TLSConfigurationTest.swift
+++ b/Tests/NIOOpenSSLTests/TLSConfigurationTest.swift
@@ -14,7 +14,7 @@
 
 import XCTest
 import CNIOOpenSSL
-@testable import NIO
+import NIO
 @testable import NIOOpenSSL
 import NIOTLS