Merge pull request swiftlang#181 from rmaz/cleanershutdown

Improve BuildServerBuildSystemTests error handling

Author: benlangmuir

Sources/SKCore/BuildServerBuildSystem.swift

@@ -30,7 +30,7 @@ public final class BuildServerBuildSystem {
   let requestQueue: DispatchQueue
 
   var handler: BuildServerHandler?
-  var buildServer: Connection?
+  var buildServer: JSONRPCConection?
   public private(set) var indexStorePath: AbsolutePath?
 
   /// Delegate to handle any build system events.
@@ -74,6 +74,7 @@ public final class BuildServerBuildSystem {
           log("error shutting down build server: \(error)")
         }
         buildServer.send(ExitBuildNotification())
+        buildServer.close()
       })
     }
   }
@@ -232,7 +233,7 @@ struct BuildServerConfig: Codable {
   let argv: [String]
 }
 
-private func makeJSONRPCBuildServer(client: MessageHandler, serverPath: AbsolutePath, serverFlags: [String]?) throws -> Connection {
+private func makeJSONRPCBuildServer(client: MessageHandler, serverPath: AbsolutePath, serverFlags: [String]?) throws -> JSONRPCConection {
   let clientToServer = Pipe()
   let serverToClient = Pipe()
 

Tests/INPUTS/BuildServerBuildSystemTests.testBuildTargetOutputs/server.py

@@ -69,5 +69,9 @@
 
     if response:
         responseStr = json.dumps(response)
-        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
-        sys.stdout.flush()
+        try:
+            sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
+            sys.stdout.flush()
+        except IOError:
+            # stdout closed, time to quit
+            break

Tests/INPUTS/BuildServerBuildSystemTests.testBuildTargetSources/server.py

@@ -92,5 +92,9 @@
 
     if response:
         responseStr = json.dumps(response)
-        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
-        sys.stdout.flush()
+        try:
+            sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
+            sys.stdout.flush()
+        except IOError:
+            # stdout closed, time to quit
+            break

Tests/INPUTS/BuildServerBuildSystemTests.testBuildTargets/server.py

@@ -88,5 +88,9 @@
 
     if response:
         responseStr = json.dumps(response)
-        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
-        sys.stdout.flush()
+        try:
+            sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
+            sys.stdout.flush()
+        except IOError:
+            # stdout closed, time to quit
+            break

Tests/INPUTS/BuildServerBuildSystemTests.testFileRegistration/server.py

@@ -7,8 +7,12 @@
 
 def send(data):
     dataStr = json.dumps(data)
-    sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(dataStr), dataStr))
-    sys.stdout.flush()
+    try:
+        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(dataStr), dataStr))
+        sys.stdout.flush()
+    except IOError:
+        # stdout closed, time to quit
+        raise SystemExit(0)
 
 
 while True:

Tests/INPUTS/BuildServerBuildSystemTests.testServerInitialize/server.py

@@ -53,5 +53,9 @@
 
     if response:
         responseStr = json.dumps(response)
-        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
-        sys.stdout.flush()
+        try:
+            sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
+            sys.stdout.flush()
+        except IOError:
+            # stdout closed, time to quit
+            break

Tests/INPUTS/BuildServerBuildSystemTests.testSettings/server.py

@@ -75,5 +75,9 @@
 
     if response:
         responseStr = json.dumps(response)
-        sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
-        sys.stdout.flush()
+        try:
+            sys.stdout.write("Content-Length: {}\r\n\r\n{}".format(len(responseStr), responseStr))
+            sys.stdout.flush()
+        except IOError:
+            # stdout closed, time to quit
+            break