Add 'PseudoTerminal' to 'TestSupport' (#1720)

* Add 'PseudoTerminal' to 'TestSupport'

* Make 'PseudoTerminal' public

* Separate back 'closeSlave()' and 'closeMaster()'

* Removed a diff when calling 'closeSlave()' in 'ProgressBarTests'

Author: JhonnyBillM

Sources/TestSupport/PseudoTerminal.swift

@@ -0,0 +1,53 @@
+/*
+ This source file is part of the Swift.org open source project
+ 
+ Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+ 
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+ */
+
+@testable import Basic
+import SPMLibc
+
+public final class PseudoTerminal {
+    let master: Int32
+    let slave: Int32
+    public var outStream: LocalFileOutputByteStream
+    
+    public init?(){
+        var master: Int32 = 0
+        var slave: Int32 = 0
+        if openpty(&master, &slave, nil, nil, nil) != 0 {
+            return nil
+        }
+        guard let outStream = try? LocalFileOutputByteStream(filePointer: fdopen(slave, "w"), closeOnDeinit: false) else {
+            return nil
+        }
+        self.outStream = outStream
+        self.master = master
+        self.slave = slave
+    }
+    
+    public func readMaster(maxChars n: Int = 1000) -> String? {
+        var buf: [CChar] = [CChar](repeating: 0, count: n)
+        if read(master, &buf, n) <= 0 {
+            return nil
+        }
+        return String(cString: buf)
+    }
+    
+    public func closeSlave() {
+        _ = SPMLibc.close(slave)
+    }
+    
+    public func closeMaster() {
+        _ = SPMLibc.close(master)
+    }
+    
+    public func close() {
+        closeSlave()
+        closeMaster()
+    }
+}

Tests/BasicTests/TerminalControllerTests.swift

@@ -9,41 +9,9 @@
 */
 
 import XCTest
-@testable import Basic
+import TestSupport
 import SPMLibc
-
-final class PseudoTerminal {
-    let master: Int32
-    let slave: Int32
-    var outStream: LocalFileOutputByteStream
-
-    init?(){
-        var master: Int32 = 0
-        var slave: Int32 = 0
-        if openpty(&master, &slave, nil, nil, nil) != 0 {
-            return nil
-        }
-        guard let outStream = try? LocalFileOutputByteStream(filePointer: fdopen(slave, "w"), closeOnDeinit: false) else {
-            return nil
-        }
-        self.outStream = outStream
-        self.master = master
-        self.slave = slave
-    }
-
-    func readMaster(maxChars n: Int = 1000) -> String? {
-        var buf: [CChar] = [CChar](repeating: 0, count: n)
-        if read(master, &buf, n) <= 0 {
-            return nil
-        }
-        return String(cString: buf)
-    }
-
-    func close() {
-        _ = SPMLibc.close(slave)
-        _ = SPMLibc.close(master)
-    }
-}
+@testable import Basic
 
 final class TerminalControllerTests: XCTestCase {
     func testBasic() {

Tests/UtilityTests/ProgressBarTests.swift

@@ -11,47 +11,11 @@
 import XCTest
 import Utility
 import SPMLibc
+import TestSupport
 @testable import Basic
 
 typealias Thread = Basic.Thread
 
-// FIXME: Copied from BasicTests, move to TestSupport once available.
-final class PseudoTerminal {
-    let master: Int32
-    let slave: Int32
-    var outStream: LocalFileOutputByteStream
-
-    init?(){
-        var master: Int32 = 0
-        var slave: Int32 = 0
-        if openpty(&master, &slave, nil, nil, nil) != 0 {
-            return nil
-        }
-        guard let outStream = try? LocalFileOutputByteStream(filePointer: fdopen(slave, "w"), closeOnDeinit: false) else {
-            return nil
-        }
-        self.outStream = outStream
-        self.master = master
-        self.slave = slave
-    }
-
-    func readMaster(maxChars n: Int = 1000) -> String? {
-        var buf: [CChar] = [CChar](repeating: 0, count: n)
-        if read(master, &buf, n) <= 0 {
-            return nil
-        }
-        return String(cString: buf)
-    }
-
-    func closeSlave() {
-        _ = SPMLibc.close(slave)
-    }
-
-    func closeMaster() {
-        _ = SPMLibc.close(master)
-    }
-}
-
 final class ProgressBarTests: XCTestCase {
     func testProgressBar() {
         guard let pty = PseudoTerminal() else {