[Cmake-commits] CMake branch, next, updated. v3.6.2-2660-gd80c9cf

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d80c9cf25a5d19a7d29c21abe5faadd23c91593d (commit)
       via  d56f9237d7205cbc2db24fa5fbdc27000454291f (commit)
      from  85863e9f451e9a829d6459a58901de59ac95bef0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d80c9cf25a5d19a7d29c21abe5faadd23c91593d
commit d80c9cf25a5d19a7d29c21abe5faadd23c91593d
Merge: 85863e9 d56f923
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 10:38:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 10:38:23 2016 -0400

    Merge topic 'cmake-server-test-wait' into next
    
    d56f9237 Tests: Teach Server test to wait for server exit


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d56f9237d7205cbc2db24fa5fbdc27000454291f
commit d56f9237d7205cbc2db24fa5fbdc27000454291f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 09:36:57 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 30 09:36:57 2016 -0400

    Tests: Teach Server test to wait for server exit
    
    We expect the server to exit when its communication pipes are closed.
    Close them and wait for the server to exit.  If supported by the current
    version of python, kill the server if it does not exit after a few
    seconds.

diff --git a/Tests/Server/server-test.py b/Tests/Server/server-test.py
index 72f82ba..14767f4 100644
--- a/Tests/Server/server-test.py
+++ b/Tests/Server/server-test.py
@@ -102,4 +102,18 @@ for obj in testData:
 
     print("Completed")
 
+# Tell the server to exit.
+proc.stdin.close()
+proc.stdout.close()
+
+# Wait for the server to exit.
+# If this version of python supports it, terminate the server after a timeout.
+try:
+    proc.wait(timeout=5)
+except TypeError:
+    proc.wait()
+except:
+    proc.terminate()
+    raise
+
 sys.exit(0)

-----------------------------------------------------------------------

Summary of changes:
 Tests/Server/server-test.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)


hooks/post-receive
-- 
CMake